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

mpegvideo_probe: count video and audio pes seperately

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-08 20:29:06 +01:00
parent 26d7eb40fd
commit b52f2d88fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mpegvideodec.c
View File

@ -34,7 +34,7 @@
static int mpegvideo_probe(AVProbeData *p) static int mpegvideo_probe(AVProbeData *p)
{ {
uint32_t code= -1; uint32_t code= -1;
int pic=0, seq=0, slice=0, pspack=0, pes=0; int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0;
int i; int i;
for(i=0; i<p->buf_size; i++){ for(i=0; i<p->buf_size; i++){
@ -46,11 +46,11 @@ static int mpegvideo_probe(AVProbeData *p)
case SLICE_START_CODE...0x1af: slice++; break; case SLICE_START_CODE...0x1af: slice++; break;
case PACK_START_CODE: pspack++; break; case PACK_START_CODE: pspack++; break;
} }
if ((code & 0x1f0) == VIDEO_ID) pes++; if ((code & 0x1f0) == VIDEO_ID) vpes++;
else if((code & 0x1e0) == AUDIO_ID) pes++; else if((code & 0x1e0) == AUDIO_ID) apes++;
} }
} }
if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes && !vpes)
return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
return 0; return 0;
} }