[SCM] libav/experimental: * simplifying OpenDML AVI handling. * adding code to skip over JUNK. It turns out that video editing software uses junk to resize ix## chunks without actually scrubbing the data. That trips up our packet extraction code since it recognizes ix## entries as "packets". Basically we have to skip over JUNK chunks for exactly the same reason we have to skip over ix## entries.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:41:11 UTC 2013
The following commit has been merged in the experimental branch:
commit 8f9298f80143fa0b5496a32aea5261591d3059c7
Author: Roman Shaposhnik <roman at shaposhnik.org>
Date: Wed Aug 4 20:57:35 2004 +0000
* simplifying OpenDML AVI handling.
* adding code to skip over JUNK. It turns out that video editing
software uses junk to resize ix## chunks without actually
scrubbing the data. That trips up our packet extraction
code since it recognizes ix## entries as "packets". Basically
we have to skip over JUNK chunks for exactly the same reason
we have to skip over ix## entries.
Originally committed as revision 3378 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 3049e7a..efb8ee3 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -49,6 +49,7 @@ typedef struct {
int64_t movi_end;
offset_t movi_list;
int index_loaded;
+ int is_odml;
DVDemuxContext* dv_demux;
} AVIContext;
@@ -128,6 +129,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
goto end_of_header;
}
break;
+ case MKTAG('d', 'm', 'l', 'h'):
+ avi->is_odml = 1;
+ url_fskip(pb, size + (size & 1));
+ break;
case MKTAG('a', 'v', 'i', 'h'):
/* avi header */
/* using frame_period is bad idea */
@@ -363,7 +368,8 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIContext *avi = s->priv_data;
ByteIOContext *pb = &s->pb;
- int n, d[8], size, i;
+ int n, d[8], size;
+ offset_t i;
void* dstr;
memset(d, -1, sizeof(int)*8);
@@ -377,19 +383,12 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
for(i=url_ftell(pb); !url_feof(pb); i++) {
int j;
- if (i >= avi->movi_end) { /* Let's see if it's an OpenDML AVI */
- uint32_t tag, size, tag2;
- url_fskip(pb, avi->riff_end - url_ftell(pb));
- if (get_riff(avi, pb) < 0)
- return -1;
-
- tag = get_le32(pb);
- size = get_le32(pb);
- tag2 = get_le32(pb);
- if (tag == MKTAG('L','I','S','T') && tag2 == MKTAG('m','o','v','i'))
- avi->movi_end = url_ftell(pb) + size - 4;
- else
- return -1;
+ if (i >= avi->movi_end) {
+ if (avi->is_odml) {
+ url_fskip(pb, avi->riff_end - i);
+ avi->riff_end = avi->movi_end = url_filesize(url_fileno(pb));
+ } else
+ break;
}
for(j=0; j<7; j++)
@@ -408,6 +407,13 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
url_fskip(pb, size);
}
+
+ //parse JUNK
+ if(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K' &&
+ i + size <= avi->movi_end) {
+
+ url_fskip(pb, size);
+ }
//parse ##dc/##wb
n= (d[0] - '0') * 10 + (d[1] - '0');
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list