Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/h263dec/h263_probe: Check TR

Browse source 
Fixes missdetection of Misdetection_345.mp3
Fixes missdetection of Misdetection_421.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-07 03:41:41 +02:00
parent 3ad21c50af
commit cd20b93e2f
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libavformat/h263dec.c
View file

@ -31,16 +31,23 @@ static int h263_probe(AVProbeData *p)
int res_change=0; int res_change=0;
int src_fmt, last_src_fmt=-1; int src_fmt, last_src_fmt=-1;
int last_gn=0; int last_gn=0;
int tr, last_tr = -1;
for(i=0; i<p->buf_size; i++){ for(i=0; i<p->buf_size; i++){
code = (code<<8) + p->buf[i]; code = (code<<8) + p->buf[i];
if ((code & 0xfffffc000000) == 0x80000000) { if ((code & 0xfffffc000000) == 0x80000000) {
tr = (code >> 18) & 0xFF;
src_fmt= (code>>10)&7; src_fmt= (code>>10)&7;
if( src_fmt != last_src_fmt if( src_fmt != last_src_fmt
&& last_src_fmt>0 && last_src_fmt<6 && last_src_fmt>0 && last_src_fmt<6
&& src_fmt<6) && src_fmt<6)
res_change++; res_change++;
if (tr == last_tr) {
invalid_psc++;
continue;
}
if (src_fmt != 7 && !(code&(1<<9)) && (code&(1<<5))) { if (src_fmt != 7 && !(code&(1<<9)) && (code&(1<<5))) {
invalid_psc++; invalid_psc++;
continue; continue;
@ -52,6 +59,7 @@ static int h263_probe(AVProbeData *p)
}else }else
invalid_psc++; invalid_psc++;
last_src_fmt= src_fmt; last_src_fmt= src_fmt;
last_tr = tr;
} else if((code & 0xffff80000000) == 0x80000000) { } else if((code & 0xffff80000000) == 0x80000000) {
int gn= (code>>(31-5)) & 0x1F; int gn= (code>>(31-5)) & 0x1F;
if(gn<last_gn){ if(gn<last_gn){