From 6cea494e32f06330d0512602b5ec3a6df6252e11 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Mon, 8 Apr 2002 12:32:01 +0000 Subject: [PATCH] =?UTF-8?q?*=20support=20for=20.au=20.gif=20.mov=20.mp4=20?= =?UTF-8?q?=20by=20Fran=C3=A7ois=20Revol=20=20=20=20hmm=20a?= =?UTF-8?q?ny=20opinions=20about=20GIF=20support=20=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 385 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libav/Makefile | 2 +- libav/au.c | 192 ++++++++++ libav/avformat.h | 9 + libav/gif.c | 404 ++++++++++++++++++++ libav/mov.c | 960 +++++++++++++++++++++++++++++++++++++++++++++++ libav/utils.c | 4 + 6 files changed, 1570 insertions(+), 1 deletion(-) create mode 100644 libav/au.c create mode 100644 libav/gif.c create mode 100644 libav/mov.c diff --git a/libav/Makefile b/libav/Makefile index 17e4469114..a243c17518 100644 --- a/libav/Makefile +++ b/libav/Makefile @@ -4,7 +4,7 @@ CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H OBJS= rm.o mpeg.o asf.o avienc.o jpeg.o swf.o wav.o raw.o \ avidec.o ffm.o \ avio.o aviobuf.o utils.o \ - file.o img.o + file.o img.o au.o gif.o mov.o ifeq ($(CONFIG_GRAB),yes) OBJS+= grab.o audio.o diff --git a/libav/au.c b/libav/au.c new file mode 100644 index 0000000000..7aefb1a6ff --- /dev/null +++ b/libav/au.c @@ -0,0 +1,192 @@ +/* + * AU encoder and decoder + * Copyright (c) 2001 Gerard Lantau. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * First version by Francois Revol revol@free.fr + * + * Reference documents: + * http://www.opengroup.org/public/pubs/external/auformat.html + * http://www.goice.co.jp/member/mo/formats/au.html + */ + +#include "avformat.h" +#include "avi.h" + +/* if we don't know the size in advance */ +#define AU_UNKOWN_SIZE ((UINT32)(~0)) + +/* The ffmpeg codecs we support, and the IDs they have in the file */ +CodecTag codec_au_tags[] = { + { CODEC_ID_PCM_MULAW, 1 }, + { CODEC_ID_PCM_S16BE, 3 }, + { CODEC_ID_PCM_ALAW, 27 }, + { 0, 0 }, +}; + +/* AUDIO_FILE header */ +int put_au_header(ByteIOContext *pb, AVCodecContext *enc) +{ + int tag; + + tag = codec_get_tag(codec_au_tags, enc->codec_id); + if (tag == 0) + return -1; + put_tag(pb, ".snd"); /* magic number */ + put_be32(pb, 24); /* header size */ + put_be32(pb, AU_UNKOWN_SIZE); /* data size */ + put_be32(pb, (UINT32)tag); /* codec ID */ + put_be32(pb, enc->sample_rate); + put_be32(pb, (UINT32)enc->channels); + return 0; +} + +static int au_write_header(AVFormatContext *s) +{ + ByteIOContext *pb = &s->pb; + + s->priv_data = NULL; + + /* format header */ + if (put_au_header(pb, &s->streams[0]->codec) < 0) { + return -1; + } + + put_flush_packet(pb); + + return 0; +} + +static int au_write_packet(AVFormatContext *s, int stream_index_ptr, + UINT8 *buf, int size) +{ + ByteIOContext *pb = &s->pb; + put_buffer(pb, buf, size); + return 0; +} + +static int au_write_trailer(AVFormatContext *s) +{ + ByteIOContext *pb = &s->pb; + offset_t file_size; + + if (!url_is_streamed(&s->pb)) { + + /* update file size */ + file_size = url_ftell(pb); + url_fseek(pb, 8, SEEK_SET); + put_be32(pb, (UINT32)(file_size - 24)); + url_fseek(pb, file_size, SEEK_SET); + + put_flush_packet(pb); + } + + return 0; +} + +/* au input */ +static int au_read_header(AVFormatContext *s, + AVFormatParameters *ap) +{ + int size; + unsigned int tag; + ByteIOContext *pb = &s->pb; + unsigned int id, codec, channels, rate; + AVStream *st; + + /* check ".snd" header */ + tag = get_le32(pb); + if (tag != MKTAG('.', 's', 'n', 'd')) + return -1; + size = get_be32(pb); /* header size */ + get_be32(pb); /* data size */ + + id = get_be32(pb); + rate = get_be32(pb); + channels = get_be32(pb); + + codec = codec_get_id(codec_au_tags, id); + + if (size >= 24) { + /* skip unused data */ + url_fseek(pb, size - 24, SEEK_CUR); + } + + /* now we are ready: build format streams */ + st = malloc(sizeof(AVStream)); + if (!st) + return -1; + s->nb_streams = 1; + s->streams[0] = st; + + st->id = 0; + + st->codec.codec_type = CODEC_TYPE_AUDIO; + st->codec.codec_tag = id; + st->codec.codec_id = codec; + st->codec.channels = channels; + st->codec.sample_rate = rate; + return 0; +} + +#define MAX_SIZE 4096 + +static int au_read_packet(AVFormatContext *s, + AVPacket *pkt) +{ + int packet_size, n, ret; + + if (url_feof(&s->pb)) + return -EIO; + packet_size = url_get_packet_size(&s->pb); + n = MAX_SIZE / packet_size; + if (n <= 0) + return n = 1; + if (av_new_packet(pkt, n * packet_size)) + return -EIO; + pkt->stream_index = 0; + + ret = get_buffer(&s->pb, pkt->data, pkt->size); + if (ret < 0) + av_free_packet(pkt); + /* note: we need to modify the packet size here to handle the last + packet */ + pkt->size = ret; + return ret; +} + +static int au_read_close(AVFormatContext *s) +{ + return 0; +} + +AVFormat au_format = { + "au", + "SUN AU Format", + "audio/basic", + "au", + CODEC_ID_PCM_S16BE, + CODEC_ID_NONE, + au_write_header, + au_write_packet, + au_write_trailer, + + au_read_header, + au_read_packet, + au_read_close, +}; diff --git a/libav/avformat.h b/libav/avformat.h index 2f5025c168..8c85b9494f 100644 --- a/libav/avformat.h +++ b/libav/avformat.h @@ -113,6 +113,10 @@ extern AVFormat asf_format; /* avienc.c */ extern AVFormat avi_format; +/* mov.c */ +extern AVFormat mov_format; +extern AVFormat mp4_format; + /* jpegenc.c */ extern AVFormat mpjpeg_format; extern AVFormat jpeg_format; @@ -121,6 +125,11 @@ extern AVFormat single_jpeg_format; /* swfenc.c */ extern AVFormat swf_format; +/* gif.c */ +extern AVFormat gif_format; +/* au.c */ +extern AVFormat au_format; + /* wav.c */ extern AVFormat wav_format; diff --git a/libav/gif.c b/libav/gif.c new file mode 100644 index 0000000000..50486586ad --- /dev/null +++ b/libav/gif.c @@ -0,0 +1,404 @@ +/* + * Animated GIF encoder + * Copyright (c) 2000 Gerard Lantau. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + * First version by Francois Revol revol@free.fr + * + * Features and limitations: + * - currently no compression is performed, + * in fact the size of the data is 9/8 the size of the image in 8bpp + * - uses only a global standard palette + * - tested with IE 5.0, Opera for BeOS, NetPositive (BeOS), and Mozilla (BeOS). + * + * Reference documents: + * http://www.goice.co.jp/member/mo/formats/gif.html + * http://astronomy.swin.edu.au/pbourke/dataformats/gif/ + * http://www.dcs.ed.ac.uk/home/mxr/gfx/2d/GIF89a.txt + * + * this url claims to have an LZW algorithm not covered by Unisys patent: + * http://www.msg.net/utility/whirlgif/gifencod.html + * could help reduce the size of the files _a lot_... + * some sites mentions an RLE type compression also. + */ + +#include "avformat.h" + +/* bitstream minipacket size */ +#define GIF_CHUNKS 100 + +/* slows down the decoding (and some browsers doesn't like it) */ +/* #define GIF_ADD_APP_HEADER */ + +typedef struct { + unsigned char r; + unsigned char g; + unsigned char b; +} rgb_triplet; + +/* we use the standard 216 color palette */ + +/* this script was used to create the palette: + * for r in 00 33 66 99 cc ff; do for g in 00 33 66 99 cc ff; do echo -n " "; for b in 00 33 66 99 cc ff; do + * echo -n "{ 0x$r, 0x$g, 0x$b }, "; done; echo ""; done; done + */ + +const rgb_triplet gif_clut[216] = { + { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x33 }, { 0x00, 0x00, 0x66 }, { 0x00, 0x00, 0x99 }, { 0x00, 0x00, 0xcc }, { 0x00, 0x00, 0xff }, + { 0x00, 0x33, 0x00 }, { 0x00, 0x33, 0x33 }, { 0x00, 0x33, 0x66 }, { 0x00, 0x33, 0x99 }, { 0x00, 0x33, 0xcc }, { 0x00, 0x33, 0xff }, + { 0x00, 0x66, 0x00 }, { 0x00, 0x66, 0x33 }, { 0x00, 0x66, 0x66 }, { 0x00, 0x66, 0x99 }, { 0x00, 0x66, 0xcc }, { 0x00, 0x66, 0xff }, + { 0x00, 0x99, 0x00 }, { 0x00, 0x99, 0x33 }, { 0x00, 0x99, 0x66 }, { 0x00, 0x99, 0x99 }, { 0x00, 0x99, 0xcc }, { 0x00, 0x99, 0xff }, + { 0x00, 0xcc, 0x00 }, { 0x00, 0xcc, 0x33 }, { 0x00, 0xcc, 0x66 }, { 0x00, 0xcc, 0x99 }, { 0x00, 0xcc, 0xcc }, { 0x00, 0xcc, 0xff }, + { 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0x33 }, { 0x00, 0xff, 0x66 }, { 0x00, 0xff, 0x99 }, { 0x00, 0xff, 0xcc }, { 0x00, 0xff, 0xff }, + { 0x33, 0x00, 0x00 }, { 0x33, 0x00, 0x33 }, { 0x33, 0x00, 0x66 }, { 0x33, 0x00, 0x99 }, { 0x33, 0x00, 0xcc }, { 0x33, 0x00, 0xff }, + { 0x33, 0x33, 0x00 }, { 0x33, 0x33, 0x33 }, { 0x33, 0x33, 0x66 }, { 0x33, 0x33, 0x99 }, { 0x33, 0x33, 0xcc }, { 0x33, 0x33, 0xff }, + { 0x33, 0x66, 0x00 }, { 0x33, 0x66, 0x33 }, { 0x33, 0x66, 0x66 }, { 0x33, 0x66, 0x99 }, { 0x33, 0x66, 0xcc }, { 0x33, 0x66, 0xff }, + { 0x33, 0x99, 0x00 }, { 0x33, 0x99, 0x33 }, { 0x33, 0x99, 0x66 }, { 0x33, 0x99, 0x99 }, { 0x33, 0x99, 0xcc }, { 0x33, 0x99, 0xff }, + { 0x33, 0xcc, 0x00 }, { 0x33, 0xcc, 0x33 }, { 0x33, 0xcc, 0x66 }, { 0x33, 0xcc, 0x99 }, { 0x33, 0xcc, 0xcc }, { 0x33, 0xcc, 0xff }, + { 0x33, 0xff, 0x00 }, { 0x33, 0xff, 0x33 }, { 0x33, 0xff, 0x66 }, { 0x33, 0xff, 0x99 }, { 0x33, 0xff, 0xcc }, { 0x33, 0xff, 0xff }, + { 0x66, 0x00, 0x00 }, { 0x66, 0x00, 0x33 }, { 0x66, 0x00, 0x66 }, { 0x66, 0x00, 0x99 }, { 0x66, 0x00, 0xcc }, { 0x66, 0x00, 0xff }, + { 0x66, 0x33, 0x00 }, { 0x66, 0x33, 0x33 }, { 0x66, 0x33, 0x66 }, { 0x66, 0x33, 0x99 }, { 0x66, 0x33, 0xcc }, { 0x66, 0x33, 0xff }, + { 0x66, 0x66, 0x00 }, { 0x66, 0x66, 0x33 }, { 0x66, 0x66, 0x66 }, { 0x66, 0x66, 0x99 }, { 0x66, 0x66, 0xcc }, { 0x66, 0x66, 0xff }, + { 0x66, 0x99, 0x00 }, { 0x66, 0x99, 0x33 }, { 0x66, 0x99, 0x66 }, { 0x66, 0x99, 0x99 }, { 0x66, 0x99, 0xcc }, { 0x66, 0x99, 0xff }, + { 0x66, 0xcc, 0x00 }, { 0x66, 0xcc, 0x33 }, { 0x66, 0xcc, 0x66 }, { 0x66, 0xcc, 0x99 }, { 0x66, 0xcc, 0xcc }, { 0x66, 0xcc, 0xff }, + { 0x66, 0xff, 0x00 }, { 0x66, 0xff, 0x33 }, { 0x66, 0xff, 0x66 }, { 0x66, 0xff, 0x99 }, { 0x66, 0xff, 0xcc }, { 0x66, 0xff, 0xff }, + { 0x99, 0x00, 0x00 }, { 0x99, 0x00, 0x33 }, { 0x99, 0x00, 0x66 }, { 0x99, 0x00, 0x99 }, { 0x99, 0x00, 0xcc }, { 0x99, 0x00, 0xff }, + { 0x99, 0x33, 0x00 }, { 0x99, 0x33, 0x33 }, { 0x99, 0x33, 0x66 }, { 0x99, 0x33, 0x99 }, { 0x99, 0x33, 0xcc }, { 0x99, 0x33, 0xff }, + { 0x99, 0x66, 0x00 }, { 0x99, 0x66, 0x33 }, { 0x99, 0x66, 0x66 }, { 0x99, 0x66, 0x99 }, { 0x99, 0x66, 0xcc }, { 0x99, 0x66, 0xff }, + { 0x99, 0x99, 0x00 }, { 0x99, 0x99, 0x33 }, { 0x99, 0x99, 0x66 }, { 0x99, 0x99, 0x99 }, { 0x99, 0x99, 0xcc }, { 0x99, 0x99, 0xff }, + { 0x99, 0xcc, 0x00 }, { 0x99, 0xcc, 0x33 }, { 0x99, 0xcc, 0x66 }, { 0x99, 0xcc, 0x99 }, { 0x99, 0xcc, 0xcc }, { 0x99, 0xcc, 0xff }, + { 0x99, 0xff, 0x00 }, { 0x99, 0xff, 0x33 }, { 0x99, 0xff, 0x66 }, { 0x99, 0xff, 0x99 }, { 0x99, 0xff, 0xcc }, { 0x99, 0xff, 0xff }, + { 0xcc, 0x00, 0x00 }, { 0xcc, 0x00, 0x33 }, { 0xcc, 0x00, 0x66 }, { 0xcc, 0x00, 0x99 }, { 0xcc, 0x00, 0xcc }, { 0xcc, 0x00, 0xff }, + { 0xcc, 0x33, 0x00 }, { 0xcc, 0x33, 0x33 }, { 0xcc, 0x33, 0x66 }, { 0xcc, 0x33, 0x99 }, { 0xcc, 0x33, 0xcc }, { 0xcc, 0x33, 0xff }, + { 0xcc, 0x66, 0x00 }, { 0xcc, 0x66, 0x33 }, { 0xcc, 0x66, 0x66 }, { 0xcc, 0x66, 0x99 }, { 0xcc, 0x66, 0xcc }, { 0xcc, 0x66, 0xff }, + { 0xcc, 0x99, 0x00 }, { 0xcc, 0x99, 0x33 }, { 0xcc, 0x99, 0x66 }, { 0xcc, 0x99, 0x99 }, { 0xcc, 0x99, 0xcc }, { 0xcc, 0x99, 0xff }, + { 0xcc, 0xcc, 0x00 }, { 0xcc, 0xcc, 0x33 }, { 0xcc, 0xcc, 0x66 }, { 0xcc, 0xcc, 0x99 }, { 0xcc, 0xcc, 0xcc }, { 0xcc, 0xcc, 0xff }, + { 0xcc, 0xff, 0x00 }, { 0xcc, 0xff, 0x33 }, { 0xcc, 0xff, 0x66 }, { 0xcc, 0xff, 0x99 }, { 0xcc, 0xff, 0xcc }, { 0xcc, 0xff, 0xff }, + { 0xff, 0x00, 0x00 }, { 0xff, 0x00, 0x33 }, { 0xff, 0x00, 0x66 }, { 0xff, 0x00, 0x99 }, { 0xff, 0x00, 0xcc }, { 0xff, 0x00, 0xff }, + { 0xff, 0x33, 0x00 }, { 0xff, 0x33, 0x33 }, { 0xff, 0x33, 0x66 }, { 0xff, 0x33, 0x99 }, { 0xff, 0x33, 0xcc }, { 0xff, 0x33, 0xff }, + { 0xff, 0x66, 0x00 }, { 0xff, 0x66, 0x33 }, { 0xff, 0x66, 0x66 }, { 0xff, 0x66, 0x99 }, { 0xff, 0x66, 0xcc }, { 0xff, 0x66, 0xff }, + { 0xff, 0x99, 0x00 }, { 0xff, 0x99, 0x33 }, { 0xff, 0x99, 0x66 }, { 0xff, 0x99, 0x99 }, { 0xff, 0x99, 0xcc }, { 0xff, 0x99, 0xff }, + { 0xff, 0xcc, 0x00 }, { 0xff, 0xcc, 0x33 }, { 0xff, 0xcc, 0x66 }, { 0xff, 0xcc, 0x99 }, { 0xff, 0xcc, 0xcc }, { 0xff, 0xcc, 0xff }, + { 0xff, 0xff, 0x00 }, { 0xff, 0xff, 0x33 }, { 0xff, 0xff, 0x66 }, { 0xff, 0xff, 0x99 }, { 0xff, 0xff, 0xcc }, { 0xff, 0xff, 0xff }, +}; + +/* The GIF format uses reversed order for bitstreams... */ +/* at least they don't use PDP_ENDIAN :) */ +/* so we 'extend' PutBitContext. hmmm, OOP :) */ +/* seems this thing changed slightly since I wrote it... */ + +#ifdef ALT_BITSTREAM_WRITER +# error no ALT_BITSTREAM_WRITER support for now +#endif + +void init_put_bits_rev(PutBitContext *s, + UINT8 *buffer, int buffer_size, + void *opaque, + void (*write_data)(void *, UINT8 *, int)) +{ + init_put_bits(s, buffer, buffer_size, opaque, write_data); +} + +void put_bits_rev(PutBitContext *s, int n, unsigned int value) +{ + unsigned int bit_buf; + int bit_cnt; + +#ifdef STATS + st_out_bit_counts[st_current_index] += n; +#endif + // printf("put_bits=%d %x\n", n, value); + assert(n == 32 || value < (1U << n)); + + bit_buf = s->bit_buf; + bit_cnt = 32 - s->bit_left; /* XXX:lazyness... was = s->bit_cnt; */ + + // printf("n=%d value=%x cnt=%d buf=%x\n", n, value, bit_cnt, bit_buf); + /* XXX: optimize */ + if (n < (32-bit_cnt)) { + bit_buf |= value << (bit_cnt); + bit_cnt+=n; + } else { + bit_buf |= value << (bit_cnt); + + *s->buf_ptr = bit_buf & 0xff; + s->buf_ptr[1] = (bit_buf >> 8) & 0xff; + s->buf_ptr[2] = (bit_buf >> 16) & 0xff; + s->buf_ptr[3] = (bit_buf >> 24) & 0xff; + + //printf("bitbuf = %08x\n", bit_buf); + s->buf_ptr+=4; + if (s->buf_ptr >= s->buf_end) + puts("bit buffer overflow !!"); // should never happen ! who got rid of the callback ??? +// flush_buffer_rev(s); + bit_cnt=bit_cnt + n - 32; + if (bit_cnt == 0) { + bit_buf = 0; + } else { + bit_buf = value >> (n - bit_cnt); + } + } + + s->bit_buf = bit_buf; + s->bit_left = 32 - bit_cnt; +} + +/* return the number of bits output */ +INT64 get_bit_count_rev(PutBitContext *s) +{ + return get_bit_count(s); +} + +void align_put_bits_rev(PutBitContext *s) +{ + align_put_bits(s); +} + +/* pad the end of the output stream with zeros */ +void flush_put_bits_rev(PutBitContext *s) +{ + while (s->bit_left < 32) { + /* XXX: should test end of buffer */ + *s->buf_ptr++=s->bit_buf & 0xff; + s->bit_buf>>=8; + s->bit_left+=8; + } +// flush_buffer_rev(s); + s->bit_left=32; + s->bit_buf=0; +} + +/* !RevPutBitContext */ + +typedef struct { + UINT8 buffer[100]; /* data chunks */ + INT64 time, file_time; +} GIFContext; + +static int gif_write_header(AVFormatContext *s) +{ + GIFContext *gif; + ByteIOContext *pb = &s->pb; + AVCodecContext *enc, *video_enc; + int i, width, height, rate; + +/* XXX: do we reject audio streams or just ignore them ? + if(s->nb_streams > 1) + return -1; +*/ + + gif = malloc(sizeof(GIFContext)); + if (!gif) + return -1; + s->priv_data = gif; + + gif->time = 0; + gif->file_time = 0; + + video_enc = NULL; + for(i=0;inb_streams;i++) { + enc = &s->streams[i]->codec; + if (enc->codec_type != CODEC_TYPE_AUDIO) + video_enc = enc; + } + + if (!video_enc) { + free(gif); + return -1; + } else { + width = video_enc->width; + height = video_enc->height; + rate = video_enc->frame_rate; + } + + /* XXX: is it allowed ? seems to work so far... */ + video_enc->pix_fmt = PIX_FMT_RGB24; + + /* GIF header */ + + put_tag(pb, "GIF"); + put_tag(pb, "89a"); + put_le16(pb, width); + put_le16(pb, height); + + put_byte(pb, 0xf7); /* flags: global clut, 256 entries */ + put_byte(pb, 0x1f); /* background color index */ + put_byte(pb, 0); /* aspect ratio */ + + /* the global palette */ + + put_buffer(pb, (unsigned char *)gif_clut, 216*3); + for(i=0;i<((256-216)*3);i++) + put_byte(pb, 0); + + /* application extension header */ + /* XXX: not really sure what to put in here... */ +#ifdef GIF_ADD_APP_HEADER + put_byte(pb, 0x21); + put_byte(pb, 0xff); + put_byte(pb, 0x0b); + put_tag(pb, "NETSCAPE2.0"); + put_byte(pb, 0x03); + put_byte(pb, 0x01); + put_byte(pb, 0x00); + put_byte(pb, 0x00); +#endif + + put_flush_packet(&s->pb); + return 0; +} + +/* this is maybe slow, but allows for extensions */ +static inline unsigned char gif_clut_index(rgb_triplet *clut, UINT8 r, UINT8 g, UINT8 b) +{ + return ((((r)/47)%6)*6*6+(((g)/47)%6)*6+(((b)/47)%6)); +} + +/* chunk writer callback */ +/* !!! XXX:deprecated +static void gif_put_chunk(void *pbctx, UINT8 *buffer, int count) +{ + ByteIOContext *pb = (ByteIOContext *)pbctx; + put_byte(pb, (UINT8)count); + put_buffer(pb, buffer, count); +} +*/ + +static int gif_write_video(AVFormatContext *s, + AVCodecContext *enc, UINT8 *buf, int size) +{ + ByteIOContext *pb = &s->pb; + GIFContext *gif = s->priv_data; + int i, left, jiffies; + INT64 delay; + PutBitContext p; + UINT8 buffer[200]; /* 100 * 9 / 8 = 113 */ + + + /* graphic control extension block */ + put_byte(pb, 0x21); + put_byte(pb, 0xf9); + put_byte(pb, 0x04); /* block size */ + put_byte(pb, 0x04); /* flags */ + + /* 1 jiffy is 1/70 s */ + /* the delay_time field indicates the number of jiffies - 1 */ + delay = gif->file_time - gif->time; + + /* XXX: should use delay, in order to be more accurate */ + /* instead of using the same rounded value each time */ + /* XXX: don't even remember if I really use it for now */ + jiffies = (70*FRAME_RATE_BASE/enc->frame_rate) - 1; + + put_le16(pb, jiffies); + + put_byte(pb, 0x1f); /* transparent color index */ + put_byte(pb, 0x00); + + /* image block */ + + put_byte(pb, 0x2c); + put_le16(pb, 0); + put_le16(pb, 0); + put_le16(pb, enc->width); + put_le16(pb, enc->height); + put_byte(pb, 0x00); /* flags */ + /* no local clut */ + + put_byte(pb, 0x08); + + left=size/3; + + /* XXX:deprecated */ + /*init_put_bits_rev(&p, buffer, sizeof(buf), (void *)pb, gif_put_chunk); *//* mmm found a but in my code: s/sizeof(buf)/150/ */ + + init_put_bits_rev(&p, buffer, 130, NULL, NULL); + +/* + * the thing here is the bitstream is written as little packets, with a size byte before + * but it's still the same bitstream between packets (no flush !) + */ + + while(left>0) { + + put_bits_rev(&p, 9, 0x0100); /* clear code */ + + for(i=0;i 0) { + put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */ + put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */ + p.data_out_size += pbBufPtr(&p) - p.buf; + p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */ + } + if(left<=GIF_CHUNKS) { + put_byte(pb, 0x00); /* end of image block */ + } + + left-=GIF_CHUNKS; + } + + put_flush_packet(&s->pb); + return 0; +} + +static int gif_write_packet(AVFormatContext *s, int stream_index, + UINT8 *buf, int size) +{ + AVCodecContext *codec = &s->streams[stream_index]->codec; + if (codec->codec_type == CODEC_TYPE_AUDIO) + return 0; /* just ignore audio */ + else + return gif_write_video(s, codec, buf, size); +} + +static int gif_write_trailer(AVFormatContext *s) +{ + GIFContext *gif = s->priv_data; + ByteIOContext *pb = &s->pb; + + put_byte(pb, 0x3b); + put_flush_packet(&s->pb); + + free(gif); + return 0; +} + +AVFormat gif_format = { + "gif", + "GIF Animation", + "image/gif", + "gif", + CODEC_ID_NONE, + CODEC_ID_RAWVIDEO, + gif_write_header, + gif_write_packet, + gif_write_trailer, + + NULL, /* read_header */ + NULL, /* read_packet */ + NULL, /* read_close */ +}; + diff --git a/libav/mov.c b/libav/mov.c new file mode 100644 index 0000000000..e784240ffb --- /dev/null +++ b/libav/mov.c @@ -0,0 +1,960 @@ +/* + * MOV decoder. + * Copyright (c) 2001 Gerard Lantau. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "avformat.h" +#include "avi.h" + +/* + * First version by Francois Revol revol@free.fr + * + * Features and limitations: + * - reads most of the QT files I have (at least the structure), + * the exceptions are .mov with zlib compressed headers ('cmov' section). It shouldn't be hard to implement. + * - ffmpeg has nearly none of the usual QuickTime codecs, + * although I succesfully dumped raw and mp3 audio tracks off .mov files. + * Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html + * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes + * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at + * http://mpeg.telecomitalialab.com/faq.htm + * - the code is quite ugly... maybe I won't do it recursive next time :-) + * + * Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/ + * when coding this :) (it's a writer anyway) + * + * Reference documents: + * http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt + * Apple: + * http://developer.apple.com/techpubs/quicktime/qtdevdocs/QTFF/qtff.html + * http://developer.apple.com/techpubs/quicktime/qtdevdocs/PDF/QTFileFormat.pdf + * QuickTime is a trademark of Apple (AFAIK :)) + */ + +#define DEBUG + +#ifdef DEBUG +/* + * XXX: static sux, even more in a multithreaded environment... + * Avoid them. This is here just to help debugging. + */ +static int debug_indent = 0; +void print_atom(const char *str, UINT32 type, UINT64 offset, UINT64 size) +{ + unsigned int tag, i; + tag = (unsigned int) type; + i=debug_indent; + if(tag == 0) tag = MKTAG('N', 'U', 'L', 'L'); + while(i--) + printf("|"); + printf("parse:"); + printf(" %s: tag=%c%c%c%c offset=%d size=0x%x\n", + str, tag & 0xff, + (tag >> 8) & 0xff, + (tag >> 16) & 0xff, + (tag >> 24) & 0xff, + (unsigned int)offset, + (unsigned int)size); +} +#endif + +/* some streams in QT (and in MP4 mostly) aren't either video nor audio */ +/* so we first list them as this, then clean up the list of streams we give back, */ +/* getting rid of these */ +#define CODEC_TYPE_MOV_OTHER 2 + +CodecTag mov_video_tags[] = { +/* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */ +/* { CODEC_ID_JPEG, MKTAG('j', 'p', 'e', 'g') }, *//* JPEG */ + { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */ + { CODEC_ID_H263, MKTAG('Y', 'u', 'v', '2') }, /* Uncompressed YUV422 */ +/* Graphics */ +/* Animation */ +/* Apple video */ +/* Kodak Photo CD */ +/* { CODEC_ID_JPEG, MKTAG('j', 'p', 'e', 'g') }, *//* JPEG ? */ + { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format A) */ + { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ +/* { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, *//* embedded gif files as frames (usually one "click to play movie" frame) */ +/* Sorenson video */ + { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, /* OpenDiVX *//* yeah ! */ + { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ +/* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */ + { 0, 0 }, +}; + +CodecTag mov_audio_tags[] = { +/* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */ + { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ + { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') }, /* 8 bits */ + { CODEC_ID_PCM_U8, 0x20776172 }, /* 8 bits unsigned */ + { CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, /* */ + { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */ + { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ +/* { CODEC_ID_, MKTAG('i', 'm', 'a', '4') }, *//* IMA-4 */ + + { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */ + { CODEC_ID_MP2, 0x6D730055 }, /* MPEG layer 3 */ + { CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */ +/* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */ +/* MP4 tags */ +/* { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, *//* MPEG 4 AAC or audio ? */ + /* The standard for mpeg4 audio is still not normalised AFAIK anyway */ + { 0, 0 }, +}; + +/* the QuickTime file format is quite convoluted... + * it has lots of index tables, each indexing something in another one... + * Here we just use what is needed to read the chunks + */ + +typedef struct MOV_sample_to_chunk_tbl { + long first; + long count; + long id; +} MOV_sample_to_chunk_tbl; + +typedef struct MOVStreamContext { + int ffindex; /* the ffmpeg stream id */ + int is_ff_stream; /* Is this stream presented to ffmpeg ? i.e. is this an audio or video stream ? */ + long next_chunk; + long chunk_count; + INT64 *chunk_offsets; + long sample_to_chunk_sz; + MOV_sample_to_chunk_tbl *sample_to_chunk; + long sample_size; + long sample_count; + long *sample_sizes; +} MOVStreamContext; + +typedef struct MOVContext { + int mp4; /* set to 1 as soon as we are sure that the file is an .mp4 file (even some header parsing depends on this) */ + AVFormatContext *fc; + long time_scale; + int found_moov; /* when both 'moov' and 'mdat' sections has been found */ + int found_mdat; /* we suppose we have enough data to read the file */ + INT64 mdat_size; + INT64 mdat_offset; + int total_streams; + /* some streams listed here aren't presented to the ffmpeg API, since they aren't either video nor audio + * but we need the info to be able to skip data from those streams in the 'mdat' section + */ + MOVStreamContext *streams[MAX_STREAMS]; + + INT64 next_chunk_offset; +} MOVContext; + + +struct MOVParseTableEntry; + +/* XXX: it's the first time I make a recursive parser I think... sorry if it's ugly :P */ + +/* those functions parse an atom */ +/* return code: + 1: found what I wanted, exit + 0: continue to parse next atom + -1: error occured, exit + */ +typedef int (*mov_parse_function)(struct MOVParseTableEntry *parse_table, + ByteIOContext *pb, + UINT32 atom_type, + INT64 atom_offset, /* after the size and type field (and eventually the extended size) */ + INT64 atom_size, /* total size (excluding the size and type fields) */ + void *param); + +/* links atom IDs to parse functions */ +typedef struct MOVParseTableEntry { + UINT32 type; + mov_parse_function func; +} MOVParseTableEntry; + +static int parse_leaf(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ +#ifdef DEBUG + print_atom("leaf", atom_type, atom_offset, atom_size); +#endif + if(atom_size>1) + url_fskip(pb, atom_size); +/* url_seek(pb, atom_offset+atom_size, SEEK_SET); */ + return 0; +} + + +static int parse_default(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + UINT32 type, foo=0; + UINT64 offset, size; + UINT64 total_size = 0; + int i; + int err = 0; + foo=0; +#ifdef DEBUG + print_atom("default", atom_type, atom_offset, atom_size); + debug_indent++; +#endif + + offset = atom_offset; + + if(atom_size < 0) + atom_size = 0x0FFFFFFFFFFFFFFF; + while((total_size < atom_size) && !url_feof(pb) && !err) { + size=atom_size; + type=0L; + if(atom_size >= 8) { + size = get_be32(pb); + type = get_le32(pb); + } + total_size += 8; + offset+=8; +// printf("type: %08lx sz: %08lx", type, size); + if(size == 1) { /* 64 bit extended size */ + size = get_be64(pb); + offset+=8; + total_size+=8; + size-=8; + } + if(size == 0) + size = atom_size - total_size; + size-=8; + for(i=0; parse_table[i].type != 0L && parse_table[i].type != type; i++); + +// printf(" i=%ld\n", i); + if(parse_table[i].type == NULL) { /* skip leaf atoms data */ +// url_seek(pb, atom_offset+atom_size, SEEK_SET); +#ifdef DEBUG + print_atom("unknown", type, offset, size); +#endif + url_fskip(pb, size); + } else + err = (parse_table[i].func)(parse_table, pb, type, offset, size, param); + + offset+=size; + total_size+=size; + } + +#ifdef DEBUG + debug_indent--; +#endif + return err; +} + +static int parse_mvhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; +#ifdef DEBUG + print_atom("mvhd", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + get_be32(pb); /* creation time */ + get_be32(pb); /* modification time */ + c->time_scale = get_be32(pb); /* time scale */ + get_be32(pb); /* duration */ + get_be32(pb); /* preferred scale */ + + get_be16(pb); /* preferred volume */ + + url_fskip(pb, 10); /* reserved */ + + url_fskip(pb, 36); /* display matrix */ + + get_be32(pb); /* preview time */ + get_be32(pb); /* preview duration */ + get_be32(pb); /* poster time */ + get_be32(pb); /* selection time */ + get_be32(pb); /* selection duration */ + get_be32(pb); /* current time */ + get_be32(pb); /* next track ID */ + + return 0; +} + +/* this atom should contain all header atoms */ +static int parse_moov(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + int err; + MOVContext *c; +#ifdef DEBUG + print_atom("moov", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + + err = parse_default(parse_table, pb, atom_type, atom_offset, atom_size, param); + /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */ + /* so we don't parse the whole file if over a network */ + c->found_moov=1; + if(c->found_mdat) + return 1; /* found both, just go */ + return 0; /* now go for mdat */ +} + +/* this atom contains actual media data */ +static int parse_mdat(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + int err; + MOVContext *c; +#ifdef DEBUG + print_atom("mdat", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + + if(atom_size == 0) /* wrong one (MP4) */ + return 0; + c->found_mdat=1; + c->mdat_offset = atom_offset; + c->mdat_size = atom_size; + if(c->found_moov) + return 1; /* found both, just go */ + url_fskip(pb, atom_size); + return 0; /* now go for moov */ +} + +static int parse_trak(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + AVStream *st; + MOVStreamContext *sc; +#ifdef DEBUG + print_atom("trak", atom_type, atom_offset, atom_size); +#endif + + c = (MOVContext *)param; + st = malloc(sizeof(AVStream)); + if (!st) return -2; + memset(st, 0, sizeof(AVStream)); + c->fc->streams[c->fc->nb_streams] = st; + sc = malloc(sizeof(MOVStreamContext)); + st->priv_data = sc; + st->codec.codec_type = CODEC_TYPE_MOV_OTHER; + c->streams[c->fc->nb_streams++] = sc; + return parse_default(parse_table, pb, atom_type, atom_offset, atom_size, param); +} + +static int parse_tkhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + AVStream *st; +#ifdef DEBUG + print_atom("tkhd", atom_type, atom_offset, atom_size); +#endif + + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + + get_byte(pb); /* version */ + + get_byte(pb); get_byte(pb); + get_byte(pb); /* flags */ + /* + MOV_TRACK_ENABLED 0x0001 + MOV_TRACK_IN_MOVIE 0x0002 + MOV_TRACK_IN_PREVIEW 0x0004 + MOV_TRACK_IN_POSTER 0x0008 + */ + + get_be32(pb); /* creation time */ + get_be32(pb); /* modification time */ + st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/ + get_be32(pb); /* reserved */ + get_be32(pb); /* duration */ + get_be32(pb); /* reserved */ + get_be32(pb); /* reserved */ + + get_be16(pb); /* layer */ + get_be16(pb); /* alternate group */ + get_be16(pb); /* volume */ + get_be16(pb); /* reserved */ + + url_fskip(pb, 36); /* display matrix */ + + /* those are fixed-point */ + st->codec.width = get_be32(pb) >> 16; /* track width */ + st->codec.height = get_be32(pb) >> 16; /* track height */ + + return 0; +} + +static int parse_hdlr(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + int len; + char *buf, ch; + UINT32 type; + AVStream *st; + UINT32 ctype; +#ifdef DEBUG + print_atom("hdlr", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + /* component type */ + ctype = get_le32(pb); + type = get_le32(pb); /* component subtype */ + +#ifdef DEBUG + printf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], ctype); + printf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]); +#endif +#ifdef DEBUG +/* XXX: yeah this is ugly... */ + if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */ + if(type == MKTAG('v', 'i', 'd', 'e')) + puts("hdlr: vide"); + else if(type == MKTAG('s', 'o', 'u', 'n')) + puts("hdlr: soun"); + } else if(ctype == 0) { /* MP4 */ + if(type == MKTAG('v', 'i', 'd', 'e')) + puts("hdlr: vide"); + else if(type == MKTAG('s', 'o', 'u', 'n')) + puts("hdlr: soun"); + else if(type == MKTAG('o', 'd', 's', 'm')) + puts("hdlr: odsm"); + else if(type == MKTAG('s', 'd', 's', 'm')) + puts("hdlr: sdsm"); + } else puts("hdlr: meta"); +#endif + + if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */ + if(type == MKTAG('v', 'i', 'd', 'e')) + st->codec.codec_type = CODEC_TYPE_VIDEO; + else if(type == MKTAG('s', 'o', 'u', 'n')) + st->codec.codec_type = CODEC_TYPE_AUDIO; + } else if(ctype == 0) { /* MP4 */ + if(type == MKTAG('v', 'i', 'd', 'e')) + st->codec.codec_type = CODEC_TYPE_VIDEO; + else if(type == MKTAG('s', 'o', 'u', 'n')) + st->codec.codec_type = CODEC_TYPE_AUDIO; + } + get_be32(pb); /* component manufacture */ + get_be32(pb); /* component flags */ + get_be32(pb); /* component flags mask */ + + if(atom_size <= 24) + return 0; /* nothing left to read */ + /* XXX: MP4 uses a C string, not a pascal one */ + /* component name */ + if(c->mp4) { +#ifdef DEBUG + puts("MP4!!!"); +#endif + while(ch=get_byte(pb)); + } else { + len = get_byte(pb); + if(len) { + buf = malloc(len+1); + get_buffer(pb, buf, len); + buf[len] = '\0'; +#ifdef DEBUG + puts(buf); +#endif + free(buf); + } + } + + return 0; +} + +static int parse_stsd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + int entries, size, samp_sz, frames_per_sample; + char *buf; + UINT32 format; + AVStream *st; +#ifdef DEBUG + print_atom("stsd", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + + entries = get_be32(pb); + + while(entries--) { + size = get_be32(pb); /* size */ + format = get_le32(pb); /* data format */ + + get_be32(pb); /* reserved */ + get_be16(pb); /* reserved */ + get_be16(pb); /* index */ +/* if(format == MKTAG('m', 'p', '4', 'v')) */ +/* st->codec.codec_type=CODEC_TYPE_VIDEO; *//* force things (XXX: was this for .mp4 ?) */ + if(st->codec.codec_type==CODEC_TYPE_VIDEO) { + st->codec.codec_tag = format; + st->codec.codec_id = codec_get_id(mov_video_tags, format); + get_be16(pb); /* version */ + get_be16(pb); /* revision level */ + get_be32(pb); /* vendor */ + get_be32(pb); /* temporal quality */ + get_be32(pb); /* spacial quality */ + st->codec.width = get_be16(pb); /* width */ + st->codec.height = get_be16(pb); /* height */ + get_be32(pb); /* horiz resolution */ + get_be32(pb); /* vert resolution */ + get_be32(pb); /* data size, always 0 */ + frames_per_sample = get_be16(pb); /* frame per samples */ +#ifdef DEBUG + printf("frames/samples = %ld\n", frames_per_sample); +#endif + url_fskip(pb, 32); /* codec name */ + + get_be16(pb); /* depth */ + get_be16(pb); /* colortable id */ + get_be16(pb); /* */ + get_be16(pb); /* */ + + st->codec.sample_rate = 25 * FRAME_RATE_BASE; + + if(size > 16) + url_fskip(pb, size-(16+24+18+32)); + } else { + st->codec.codec_tag = format; + + get_be16(pb); /* version */ + get_be16(pb); /* revision level */ + get_be32(pb); /* vendor */ + + st->codec.channels = get_be16(pb);/* channel count */ + samp_sz = get_be16(pb); /* sample size */ +#ifdef DEBUG + if(samp_sz != 16) + puts("!!! stsd: audio sample size is not 16 bit !"); +#endif + st->codec.codec_id = codec_get_id(mov_audio_tags, format); + /* handle specific s8 codec */ + if (st->codec.codec_id == CODEC_ID_PCM_S16BE && samp_sz == 8) + st->codec.codec_id = CODEC_ID_PCM_S8; + + get_be16(pb); /* compression id = 0*/ + get_be16(pb); /* packet size = 0 */ + + st->codec.sample_rate = ((get_be32(pb) >> 16)); + st->codec.bit_rate = 0; + + /* this is for .mp4 files */ + if(format == MKTAG('m', 'p', '4', 'v')) { /* XXX */ + st->codec.codec_type=CODEC_TYPE_VIDEO; /* force things */ + st->codec.codec_id = CODEC_ID_MPEG4; + st->codec.frame_rate = 25; + st->codec.bit_rate = 100000; + } + +#if 0 + + get_be16(pb); get_be16(pb); /* */ + get_be16(pb); /* */ + get_be16(pb); /* */ + get_be16(pb); /* */ + get_be16(pb); /* */ +#endif + if(size > 16) + url_fskip(pb, size-(16+20)); + } +#ifdef DEBUG + printf("4CC= %c%c%c%c\n", *((char *)&format), ((char *)&format)[1], ((char *)&format)[2], ((char *)&format)[3]); +#endif + } +/* + if(len) { + buf = malloc(len+1); + get_buffer(pb, buf, len); + buf[len] = '\0'; + puts(buf); + free(buf); + } +*/ + return 0; +} + +static int parse_stco(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + int entries, i; + AVStream *st; + MOVStreamContext *sc; +#ifdef DEBUG + print_atom("stco", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + sc = (MOVStreamContext *)st->priv_data; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + entries = get_be32(pb); + sc->chunk_count = entries; + sc->chunk_offsets = malloc(entries * sizeof(INT64)); + if(atom_type == MKTAG('s', 't', 'c', 'o')) { + for(i=0; ichunk_offsets[i] = get_be32(pb); + /*printf("chunk offset=%ld\n", sc->chunk_offsets[i]);*/ + } + } else if(atom_type == MKTAG('c', 'o', '6', '4')) { + for(i=0; ichunk_offsets[i] = get_be64(pb); + /*printf("chunk offset=%ld\n", sc->chunk_offsets[i]);*/ + } + } else + return -1; + return 0; +} + +static int parse_stsc(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + int entries, i; + AVStream *st; + MOVStreamContext *sc; +#ifdef DEBUG + print_atom("stsc", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + sc = (MOVStreamContext *)st->priv_data; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + entries = get_be32(pb); + sc->sample_to_chunk_sz = entries; + sc->sample_to_chunk = malloc(entries * sizeof(MOV_sample_to_chunk_tbl)); + for(i=0; isample_to_chunk[i].first = get_be32(pb); + sc->sample_to_chunk[i].count = get_be32(pb); + sc->sample_to_chunk[i].id = get_be32(pb); +#ifdef DEBUG +/* printf("sample_to_chunk first=%ld count=%ld, id=%ld\n", sc->sample_to_chunk[i].first, sc->sample_to_chunk[i].count, sc->sample_to_chunk[i].id); */ +#endif + } + return 0; +} + +static int parse_stsz(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) +{ + MOVContext *c; + int entries, i; + AVStream *st; + MOVStreamContext *sc; +#ifdef DEBUG + print_atom("stsz", atom_type, atom_offset, atom_size); +#endif + c = (MOVContext *)param; + st = c->fc->streams[c->fc->nb_streams-1]; + sc = (MOVStreamContext *)st->priv_data; + + get_byte(pb); /* version */ + get_byte(pb); get_byte(pb); get_byte(pb); /* flags */ + + sc->sample_size = get_be32(pb); + entries = get_be32(pb); + sc->sample_count = entries; + printf("sample_size = %ld sample_count = %ld\n", sc->sample_size, sc->sample_count); + if(sc->sample_size) + return 0; /* there isn't any table following */ + sc->sample_sizes = malloc(entries * sizeof(long)); + for(i=0; isample_sizes[i] = get_be32(pb); +#ifdef DEBUG +/* printf("sample_sizes[]=%ld\n", sc->sample_sizes[i]); */ +#endif + } + return 0; +} + +static const MOVParseTableEntry mov_default_parse_table[] = { +/* mp4 atoms */ +{ MKTAG( 'm', 'p', '4', 'a' ), parse_default }, +{ MKTAG( 'c', 'o', '6', '4' ), parse_stco }, +{ MKTAG( 's', 't', 'c', 'o' ), parse_stco }, +{ MKTAG( 'c', 'r', 'h', 'd' ), parse_default }, +{ MKTAG( 'c', 't', 't', 's' ), parse_leaf }, +{ MKTAG( 'c', 'p', 'r', 't' ), parse_default }, +{ MKTAG( 'u', 'r', 'l', ' ' ), parse_leaf }, +{ MKTAG( 'u', 'r', 'n', ' ' ), parse_leaf }, +{ MKTAG( 'd', 'i', 'n', 'f' ), parse_default }, +{ MKTAG( 'd', 'r', 'e', 'f' ), parse_leaf }, +{ MKTAG( 's', 't', 'd', 'p' ), parse_default }, +{ MKTAG( 'e', 's', 'd', 's' ), parse_default }, +{ MKTAG( 'e', 'd', 't', 's' ), parse_default }, +{ MKTAG( 'e', 'l', 's', 't' ), parse_leaf }, +{ MKTAG( 'u', 'u', 'i', 'd' ), parse_default }, +{ MKTAG( 'f', 'r', 'e', 'e' ), parse_leaf }, +{ MKTAG( 'h', 'd', 'l', 'r' ), parse_hdlr }, +{ MKTAG( 'h', 'm', 'h', 'd' ), parse_default }, +{ MKTAG( 'h', 'i', 'n', 't' ), parse_leaf }, +{ MKTAG( 'n', 'm', 'h', 'd' ), parse_leaf }, +{ MKTAG( 'm', 'p', '4', 's' ), parse_default }, +{ MKTAG( 'm', 'd', 'i', 'a' ), parse_default }, +{ MKTAG( 'm', 'd', 'a', 't' ), parse_mdat }, +{ MKTAG( 'm', 'd', 'h', 'd' ), parse_leaf }, +{ MKTAG( 'm', 'i', 'n', 'f' ), parse_default }, +{ MKTAG( 'm', 'o', 'o', 'v' ), parse_moov }, +{ MKTAG( 'm', 'v', 'h', 'd' ), parse_mvhd }, +{ MKTAG( 'i', 'o', 'd', 's' ), parse_leaf }, +{ MKTAG( 'o', 'd', 'h', 'd' ), parse_default }, +{ MKTAG( 'm', 'p', 'o', 'd' ), parse_leaf }, +{ MKTAG( 's', 't', 's', 'd' ), parse_stsd }, +{ MKTAG( 's', 't', 's', 'z' ), parse_stsz }, +{ MKTAG( 's', 't', 'b', 'l' ), parse_default }, +{ MKTAG( 's', 't', 's', 'c' ), parse_stsc }, +{ MKTAG( 's', 'd', 'h', 'd' ), parse_default }, +{ MKTAG( 's', 't', 's', 'h' ), parse_default }, +{ MKTAG( 's', 'k', 'i', 'p' ), parse_default }, +{ MKTAG( 's', 'm', 'h', 'd' ), parse_leaf }, +{ MKTAG( 'd', 'p', 'n', 'd' ), parse_leaf }, +{ MKTAG( 's', 't', 's', 's' ), parse_leaf }, +{ MKTAG( 's', 't', 't', 's' ), parse_leaf }, +{ MKTAG( 't', 'r', 'a', 'k' ), parse_trak }, +{ MKTAG( 't', 'k', 'h', 'd' ), parse_tkhd }, +{ MKTAG( 't', 'r', 'e', 'f' ), parse_default }, /* not really */ +{ MKTAG( 'u', 'd', 't', 'a' ), parse_leaf }, +{ MKTAG( 'v', 'm', 'h', 'd' ), parse_leaf }, +{ MKTAG( 'm', 'p', '4', 'v' ), parse_default }, +/* extra mp4 */ +{ MKTAG( 'M', 'D', 'E', 'S' ), parse_leaf }, +/* QT atoms */ +{ MKTAG( 'c', 'h', 'a', 'p' ), parse_leaf }, +{ MKTAG( 'c', 'l', 'i', 'p' ), parse_default }, +{ MKTAG( 'c', 'r', 'g', 'n' ), parse_leaf }, +{ MKTAG( 'k', 'm', 'a', 't' ), parse_leaf }, +{ MKTAG( 'm', 'a', 't', 't' ), parse_default }, +{ MKTAG( 'r', 'd', 'r', 'f' ), parse_leaf }, +{ MKTAG( 'r', 'm', 'd', 'a' ), parse_default }, +{ MKTAG( 'r', 'm', 'd', 'r' ), parse_leaf }, +//{ MKTAG( 'r', 'm', 'q', 'u' ), parse_leaf }, +{ MKTAG( 'r', 'm', 'r', 'a' ), parse_default }, +{ MKTAG( 's', 'c', 'p', 't' ), parse_leaf }, +{ MKTAG( 's', 'y', 'n', 'c' ), parse_leaf }, +{ MKTAG( 's', 's', 'r', 'c' ), parse_leaf }, +{ MKTAG( 't', 'c', 'm', 'd' ), parse_leaf }, +{ MKTAG( 'w', 'i', 'd', 'e' ), parse_leaf }, /* place holder */ +{ 0L, parse_leaf } +}; + +static void mov_free_stream_context(MOVStreamContext *sc) +{ + if(sc) { + if(sc->chunk_offsets) + free(sc->chunk_offsets); + if(sc->sample_to_chunk) + free(sc->sample_to_chunk); + free(sc); + } +} + +int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) +{ + MOVContext *mov; + ByteIOContext *pb = &s->pb; + UINT32 tag, tag1; + int i, j, nb, bps, err; + INT64 size; + AVStream *st; + + mov = malloc(sizeof(MOVContext)); + if (!mov) + return -1; + memset(mov, 0, sizeof(MOVContext)); + s->priv_data = mov; + + mov->fc = s; + if(s->format->name[1] == 'p') + mov->mp4 = 1; + if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ + size = url_filesize(url_fileno(pb)); + else + size = 0x7FFFFFFFFFFFFFFF; + +#ifdef DEBUG + printf("filesz=%ld\n", size); +#endif + + /* check MOV header */ + err = parse_default(mov_default_parse_table, pb, 0L, 0LL, size, mov); + if(err<0 || (!mov->found_moov || !mov->found_mdat)) { + puts("header not found !!!"); + exit(1); + } +#ifdef DEBUG + printf("on_parse_exit_offset=%ld\n", url_ftell(pb)); +#endif + /* some cleanup : make sure we are on the mdat atom */ + if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset)) + url_fseek(pb, mov->mdat_offset, SEEK_SET); + + mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */ + +#ifdef DEBUG + printf("mdat_reset_offset=%ld\n", url_ftell(pb)); +#endif + +#ifdef DEBUG + printf("streams= %ld\n", s->nb_streams); +#endif + mov->total_streams = nb = s->nb_streams; + +#if 1 + for(i=0; inb_streams;) { + if(s->streams[i]->codec.codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */ + free(s->streams[i]); + for(j=i+1; jnb_streams; j++) + s->streams[j-1] = s->streams[j]; + s->nb_streams--; + } else + i++; + } + for(i=0; inb_streams;i++) { + MOVStreamContext *sc; + sc = (MOVStreamContext *)s->streams[i]->priv_data; + sc->ffindex = i; + sc->is_ff_stream = 1; + } +#endif +#ifdef DEBUG + printf("real streams= %ld\n", s->nb_streams); +#endif + return 0; +} + +/* Yes, this is ugly... I didn't write the specs of QT :p */ +/* XXX:remove useless commented code sometime */ +int mov_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + MOVContext *mov = s->priv_data; + INT64 offset = 0x0FFFFFFFFFFFFFFF; + int i, j; + int st_id = 0, size; + size = 0x0FFFFFFF; + +again: + for(i=0; itotal_streams; i++) { +/* printf("%8ld ", mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk]); */ + if((mov->streams[i]->next_chunk < mov->streams[i]->chunk_count) + && (mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk] < offset)) { +/* printf("y"); */ + st_id = i; + offset = mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk]; + } +/* else printf("n"); */ + } + mov->streams[st_id]->next_chunk++; + if(offset==0x0FFFFFFFFFFFFFFF) + return -1; + + if(mov->next_chunk_offset < offset) /* some meta data */ + url_fskip(&s->pb, (offset - mov->next_chunk_offset)); + if(!mov->streams[st_id]->is_ff_stream) { + url_fskip(&s->pb, (offset - mov->next_chunk_offset)); + offset = 0x0FFFFFFFFFFFFFFF; +/* puts("*"); */ + goto again; + } +/* printf("\nchunk offset = %ld\n", offset); */ + + /* now get the chunk size... */ + + for(i=0; itotal_streams; i++) { +/* printf("%ld ", mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk] - offset); */ + if((mov->streams[i]->next_chunk < mov->streams[i]->chunk_count) + && ((mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk] - offset) < size)) { +/* printf("y"); */ + size = mov->streams[i]->chunk_offsets[mov->streams[i]->next_chunk] - offset; + } +/* else printf("n"); */ + } +/* printf("\nchunk size = %ld\n", size); */ + if(size == 0x0FFFFFFF) + size = mov->mdat_size + mov->mdat_offset - offset; + if(size < 0) + return -1; + if(size == 0) + return -1; + av_new_packet(pkt, size); + pkt->stream_index = mov->streams[st_id]->ffindex; + + get_buffer(&s->pb, pkt->data, pkt->size); + +#ifdef DEBUG +/* + printf("Packet (%d, %d, %ld) ", pkt->stream_index, st_id, pkt->size); + for(i=0; i<8; i++) + printf("%02x ", pkt->data[i]); + for(i=0; i<8; i++) + printf("%c ", (pkt->data[i]) & 0x7F); + puts(""); +*/ +#endif + + mov->next_chunk_offset = offset + size; + + return 0; +} + +int mov_read_close(AVFormatContext *s) +{ + int i; + MOVContext *mov = s->priv_data; + for(i=0; itotal_streams; i++) + mov_free_stream_context(mov->streams[i]); + for(i=0; inb_streams; i++) + free(s->streams[i]); + free(mov); + return 0; +} + +AVFormat mov_format = { + "mov", + "QuickTime format", + "video/quicktime", + "mov", + CODEC_ID_MP2, + CODEC_ID_MJPEG, + NULL, + NULL, + NULL, + + mov_read_header, + mov_read_packet, + mov_read_close, +}; + +AVFormat mp4_format = { + "mp4", + "MPEG4 file format", + "video/mpeg4", + "mp4", + CODEC_ID_MP2, + CODEC_ID_MJPEG, + NULL, + NULL, + NULL, + + mov_read_header, + mov_read_packet, + mov_read_close, +}; diff --git a/libav/utils.c b/libav/utils.c index 8570be2055..8520656a1b 100644 --- a/libav/utils.c +++ b/libav/utils.c @@ -138,10 +138,14 @@ void register_all(void) register_avformat(&rm_format); register_avformat(&asf_format); register_avformat(&avi_format); + register_avformat(&mov_format); + register_avformat(&mp4_format); register_avformat(&mpjpeg_format); register_avformat(&jpeg_format); register_avformat(&single_jpeg_format); register_avformat(&swf_format); + register_avformat(&gif_format); + register_avformat(&au_format); register_avformat(&wav_format); register_avformat(&pcm_s16le_format); register_avformat(&pcm_s16be_format);