[FFmpeg-cvslog] r11149 - trunk/libavformat/mpeg.c
michael
subversion
Mon Dec 3 10:37:07 CET 2007
Author: michael
Date: Mon Dec 3 10:37:06 2007
New Revision: 11149
Log:
make mpeg-ps probe less happy with random data
fixes missdetection of O-MP3-5.mp3
Modified:
trunk/libavformat/mpeg.c
Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c (original)
+++ trunk/libavformat/mpeg.c Mon Dec 3 10:37:06 2007
@@ -67,7 +67,7 @@ static int check_pes(uint8_t *p, uint8_t
static int mpegps_probe(AVProbeData *p)
{
uint32_t code= -1;
- int sys=0, pspack=0, priv1=0, vid=0, audio=0;
+ int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
int i;
int score=0;
@@ -85,16 +85,19 @@ static int mpegps_probe(AVProbeData *p)
else if(code == PACK_START_CODE) pspack++;
else if((code & 0xf0) == VIDEO_ID && pes) vid++;
else if((code & 0xe0) == AUDIO_ID && pes) audio++;
+
+ else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
+ else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
}
}
- if(vid || audio) /* invalid VDR files nd short PES streams */
+ if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
score= AVPROBE_SCORE_MAX/4;
//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
- if(sys && sys*9 <= pspack*10)
+ if(sys>invalid && sys*9 <= pspack*10)
return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
- if((priv1 || vid || audio) && (priv1+vid+audio)*9 <= pspack*10)
+ if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
if((!!vid ^ !!audio) && (audio+vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
return AVPROBE_SCORE_MAX/2+2;
More information about the ffmpeg-cvslog
mailing list