diff options
author | Vladimir Voroshilov <voroshil@gmail.com> | 2007-09-29 22:47:34 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-09-29 22:47:34 +0000 |
commit | 0b04ebb3265400a1e6208ed9200d42a526a00732 (patch) | |
tree | d97eb28be3413f66dc992ba7f983380a61e6a98e /libavformat/avidec.c | |
parent | 7b93361739c46cbd97cd15d99f4711800095ea2d (diff) | |
download | ffmpeg-streaming-0b04ebb3265400a1e6208ed9200d42a526a00732.zip ffmpeg-streaming-0b04ebb3265400a1e6208ed9200d42a526a00732.tar.gz |
Add support for AMV variants of AVI files.
patch by Vladimir Voroshilov, voroshil gmail com
Date: Sun, 30 Sep 2007 00:30:34 +0700
Subject: Re: [FFmpeg-devel] [PATCH] Demuxer for AMV files
Originally committed as revision 10623 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r-- | libavformat/avidec.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 9ff67bd..c6b17a2 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -62,6 +62,7 @@ static const char avi_headers[][8] = { { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19}, { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' }, + { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' }, { 0 } }; @@ -232,6 +233,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) AVStream *st; AVIStream *ast = NULL; char str_track[4]; + int avih_width=0, avih_height=0; + int amv_file_format=0; avi->stream_index= -1; @@ -276,6 +279,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) avi->is_odml = 1; url_fskip(pb, size + (size & 1)); break; + case MKTAG('a', 'm', 'v', 'h'): + amv_file_format=1; case MKTAG('a', 'v', 'i', 'h'): /* avi header */ /* using frame_period is bad idea */ @@ -286,8 +291,11 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) url_fskip(pb, 2 * 4); get_le32(pb); + get_le32(pb); + avih_width=get_le32(pb); + avih_height=get_le32(pb); - url_fskip(pb, size - 7 * 4); + url_fskip(pb, size - 10 * 4); break; case MKTAG('s', 't', 'r', 'h'): /* stream header */ @@ -309,6 +317,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) goto fail; st->priv_data = ast; } + if(amv_file_format) + tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s'); #ifdef DEBUG print_tag("strh", tag1, -1); @@ -416,6 +426,14 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) st = s->streams[stream_index]; switch(codec_type) { case CODEC_TYPE_VIDEO: + if(amv_file_format){ + st->codec->width=avih_width; + st->codec->height=avih_height; + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_AMV; + url_fskip(pb, size); + break; + } get_le32(pb); /* size */ st->codec->width = get_le32(pb); st->codec->height = get_le32(pb); @@ -486,6 +504,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_id = CODEC_ID_XAN_DPCM; st->codec->codec_tag = 0; } + if (amv_file_format) + st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; break; default: st->codec->codec_type = CODEC_TYPE_DATA; |