generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asfdec: correctly parse payload extensions

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c93269e42)

Conflicts:

	libavformat/asfdec.c
This commit is contained in:
Michael Niedermayer
2012-11-03 05:37:18 +01:00
committed by Carl Eugen Hoyos
parent 3ac97550ce
commit 19de5478f0
1 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/asfdec.c
View File

@@ -925,13 +925,16 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb)
*/ */
static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
ASFStream *asfst;
int rsize = 1; int rsize = 1;
int num = avio_r8(pb); int num = avio_r8(pb);
int i;
int64_t ts0, ts1 av_unused; int64_t ts0, ts1 av_unused;
asf->packet_segments--; asf->packet_segments--;
asf->packet_key_frame = num >> 7; asf->packet_key_frame = num >> 7;
asf->stream_index = asf->asfid2avid[num & 0x7f]; asf->stream_index = asf->asfid2avid[num & 0x7f];
asfst = &asf->streams[num & 0x7f];
// sequence should be ignored! // sequence should be ignored!
DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
@@ -942,26 +945,48 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (asf->packet_replic_size >= 8) { if (asf->packet_replic_size >= 8) {
int64_t end = avio_tell(pb) + asf->packet_replic_size;
asf->packet_obj_size = avio_rl32(pb); asf->packet_obj_size = avio_rl32(pb);
if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){
av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
asf->packet_frag_timestamp = avio_rl32(pb); // timestamp asf->packet_frag_timestamp = avio_rl32(pb); // timestamp
if(asf->packet_replic_size >= 8+38+4){
// for(i=0; i<asf->packet_replic_size-8; i++) for (i=0; i<asfst->payload_ext_ct; i++) {
// av_log(s, AV_LOG_DEBUG, "%02X ",avio_r8(pb)); ASFPayload *p = &asfst->payload[i];
// av_log(s, AV_LOG_DEBUG, "\n"); int size = p->size;
avio_skip(pb, 10); int64_t payend;
if(size == 0xFFFF)
size = avio_rl16(pb);
payend = avio_tell(pb) + size;
if (payend > end) {
av_log(s, AV_LOG_ERROR, "too long payload\n");
break;
}
switch(p->type) {
case 0x50:
// duration = avio_rl16(pb);
break;
case 0x2A:
avio_skip(pb, 8);
ts0= avio_rl64(pb); ts0= avio_rl64(pb);
ts1= avio_rl64(pb); ts1= avio_rl64(pb);
avio_skip(pb, 12);
avio_rl32(pb);
avio_skip(pb, asf->packet_replic_size - 8 - 38 - 4);
if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
else asf->packet_frag_timestamp= AV_NOPTS_VALUE; else asf->packet_frag_timestamp= AV_NOPTS_VALUE;
}else break;
avio_skip(pb, asf->packet_replic_size - 8); case 0x5B:
case 0xB7:
case 0xCC:
case 0xC0:
case 0xA0:
//unknown
break;
}
avio_seek(pb, payend, SEEK_SET);
}
avio_seek(pb, end, SEEK_SET);
rsize += asf->packet_replic_size; // FIXME - check validity rsize += asf->packet_replic_size; // FIXME - check validity
} else if (asf->packet_replic_size==1){ } else if (asf->packet_replic_size==1){
// multipacket - frag_offset is beginning timestamp // multipacket - frag_offset is beginning timestamp