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

mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.

Browse Source
This commit is contained in:
Ronald S. Bultje 2012-05-02 15:45:18 -07:00
parent d041dec3cb
commit 64bde80563
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/ac3dec.c
View File

@ -57,10 +57,30 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
if(codec_id != expected_codec_id) return 0; if(codec_id != expected_codec_id) return 0;
// keep this in sync with mp3 probe, both need to avoid // keep this in sync with mp3 probe, both need to avoid
// issues with MPEG-files! // issues with MPEG-files!
if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; if (first_frames >= 4) return AVPROBE_SCORE_MAX / 2 + 1;
else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; if (max_frames) {
else if(max_frames>=1) return 1; int pes = 0, i;
unsigned int code = -1;
#define VIDEO_ID 0x000001e0
#define AUDIO_ID 0x000001c0
/* do a search for mpegps headers to be able to properly bias
* towards mpegps if we detect this stream as both. */
for (i = 0; i<p->buf_size; i++) {
code = (code << 8) + p->buf[i];
if ((code & 0xffffff00) == 0x100) {
if ((code & 0x1f0) == VIDEO_ID) pes++;
else if((code & 0x1e0) == AUDIO_ID) pes++;
}
}
if (pes)
max_frames = (max_frames + pes - 1) / pes;
}
if (max_frames > 500) return AVPROBE_SCORE_MAX / 2;
else if (max_frames >= 4) return AVPROBE_SCORE_MAX / 4;
else if (max_frames >= 1) return 1;
else return 0; else return 0;
} }

28
libavformat/mp3dec.c
View File

@ -63,10 +63,30 @@ static int mp3_read_probe(AVProbeData *p)
} }
// keep this in sync with ac3 probe, both need to avoid // keep this in sync with ac3 probe, both need to avoid
// issues with MPEG-files! // issues with MPEG-files!
if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1; if (first_frames >= 4) return AVPROBE_SCORE_MAX / 2 + 1;
else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; if (max_frames) {
else if(max_frames>=1) return 1; int pes = 0, i;
unsigned int code = -1;
#define VIDEO_ID 0x000001e0
#define AUDIO_ID 0x000001c0
/* do a search for mpegps headers to be able to properly bias
* towards mpegps if we detect this stream as both. */
for (i = 0; i<p->buf_size; i++) {
code = (code << 8) + p->buf[i];
if ((code & 0xffffff00) == 0x100) {
if ((code & 0x1f0) == VIDEO_ID) pes++;
else if((code & 0x1e0) == AUDIO_ID) pes++;
}
}
if (pes)
max_frames = (max_frames + pes - 1) / pes;
}
if (max_frames > 500) return AVPROBE_SCORE_MAX / 2;
else if (max_frames >= 4) return AVPROBE_SCORE_MAX / 4;
else if (max_frames >= 1) return 1;
else return 0; else return 0;
//mpegps_mp3_unrecognized_format.mpg has max_frames=3 //mpegps_mp3_unrecognized_format.mpg has max_frames=3
} }