#include "avformat.h"
#include "rawdec.h"
-static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
+static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id)
{
int max_frames, first_frames = 0, frames;
uint8_t *buf, *buf2, *end;
AC3HeaderInfo hdr;
GetBitContext gbc;
- enum CodecID codec_id = CODEC_ID_AC3;
+ enum AVCodecID codec_id = AV_CODEC_ID_AC3;
max_frames = 0;
buf = p->buf;
av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, buf2 + 2, hdr.frame_size - 2))
break;
if (hdr.bitstream_id > 10)
- codec_id = CODEC_ID_EAC3;
+ codec_id = AV_CODEC_ID_EAC3;
buf2 += hdr.frame_size;
}
max_frames = FFMAX(max_frames, frames);
if(codec_id != expected_codec_id) return 0;
// keep this in sync with mp3 probe, both need to avoid
// issues with MPEG-files!
- 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;
- else if(max_frames>=1) return 1;
- else return 0;
+ if (first_frames >= 4) return AVPROBE_SCORE_MAX / 2 + 1;
+
+ if (max_frames) {
+ 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;
}
#if CONFIG_AC3_DEMUXER
static int ac3_probe(AVProbeData *p)
{
- return ac3_eac3_probe(p, CODEC_ID_AC3);
+ return ac3_eac3_probe(p, AV_CODEC_ID_AC3);
}
AVInputFormat ff_ac3_demuxer = {
.read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX,
.extensions = "ac3",
- .raw_codec_id = CODEC_ID_AC3,
+ .raw_codec_id = AV_CODEC_ID_AC3,
};
#endif
#if CONFIG_EAC3_DEMUXER
static int eac3_probe(AVProbeData *p)
{
- return ac3_eac3_probe(p, CODEC_ID_EAC3);
+ return ac3_eac3_probe(p, AV_CODEC_ID_EAC3);
}
AVInputFormat ff_eac3_demuxer = {
.read_probe = eac3_probe,
.read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "eac3",
- .raw_codec_id = CODEC_ID_EAC3,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "eac3",
+ .raw_codec_id = AV_CODEC_ID_EAC3,
};
#endif