*/
#include "avformat.h"
+#include "avio_internal.h"
#include "internal.h"
#include "mpeg.h"
return (buf[1] & 0xC0) == 0x40 || (buf[1] & 0xF0) == 0x20;
}
-static int mpegps_probe(AVProbeData *p)
+static int mpegps_probe(const AVProbeData *p)
{
uint32_t code = -1;
int i;
int sofdec;
int dvd;
int imkh_cctv;
+ int raw_ac3;
#if CONFIG_VOBSUB_DEMUXER
AVFormatContext *sub_ctx;
FFDemuxSubtitlesQueue q[32];
}
if (startcode == PRIVATE_STREAM_1) {
+ int ret = ffio_ensure_seekback(s->pb, 2);
+
+ if (ret < 0)
+ return ret;
+
startcode = avio_r8(s->pb);
- len--;
+ m->raw_ac3 = 0;
+ if (startcode == 0x0b) {
+ if (avio_r8(s->pb) == 0x77) {
+ startcode = 0x80;
+ m->raw_ac3 = 1;
+ avio_skip(s->pb, -2);
+ } else {
+ avio_skip(s->pb, -1);
+ }
+ } else {
+ len--;
+ }
}
if (len < 0)
goto error_redo;
if (len < 4)
goto skip;
- /* audio: skip header */
- avio_r8(s->pb);
- lpcm_header_len = avio_rb16(s->pb);
- len -= 3;
- if (startcode >= 0xb0 && startcode <= 0xbf) {
- /* MLP/TrueHD audio has a 4-byte header */
+ if (!m->raw_ac3) {
+ /* audio: skip header */
avio_r8(s->pb);
- len--;
+ lpcm_header_len = avio_rb16(s->pb);
+ len -= 3;
+ if (startcode >= 0xb0 && startcode <= 0xbf) {
+ /* MLP/TrueHD audio has a 4-byte header */
+ avio_r8(s->pb);
+ len--;
+ }
}
}
}
es_type = m->psm_es_type[startcode & 0xff];
- if (es_type == STREAM_TYPE_VIDEO_MPEG1) {
- codec_id = AV_CODEC_ID_MPEG2VIDEO;
- type = AVMEDIA_TYPE_VIDEO;
- } else if (es_type == STREAM_TYPE_VIDEO_MPEG2) {
- codec_id = AV_CODEC_ID_MPEG2VIDEO;
- type = AVMEDIA_TYPE_VIDEO;
- } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 ||
- es_type == STREAM_TYPE_AUDIO_MPEG2) {
- codec_id = AV_CODEC_ID_MP3;
- type = AVMEDIA_TYPE_AUDIO;
- } else if (es_type == STREAM_TYPE_AUDIO_AAC) {
- codec_id = AV_CODEC_ID_AAC;
- type = AVMEDIA_TYPE_AUDIO;
- } else if (es_type == STREAM_TYPE_VIDEO_MPEG4) {
- codec_id = AV_CODEC_ID_MPEG4;
- type = AVMEDIA_TYPE_VIDEO;
- } else if (es_type == STREAM_TYPE_VIDEO_H264) {
- codec_id = AV_CODEC_ID_H264;
- type = AVMEDIA_TYPE_VIDEO;
- } else if (es_type == STREAM_TYPE_AUDIO_AC3) {
- codec_id = AV_CODEC_ID_AC3;
- type = AVMEDIA_TYPE_AUDIO;
- } else if (m->imkh_cctv && es_type == 0x91) {
- codec_id = AV_CODEC_ID_PCM_MULAW;
- type = AVMEDIA_TYPE_AUDIO;
+ if (es_type == STREAM_TYPE_VIDEO_MPEG1) {
+ codec_id = AV_CODEC_ID_MPEG2VIDEO;
+ type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_VIDEO_MPEG2) {
+ codec_id = AV_CODEC_ID_MPEG2VIDEO;
+ type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 ||
+ es_type == STREAM_TYPE_AUDIO_MPEG2) {
+ codec_id = AV_CODEC_ID_MP3;
+ type = AVMEDIA_TYPE_AUDIO;
+ } else if (es_type == STREAM_TYPE_AUDIO_AAC) {
+ codec_id = AV_CODEC_ID_AAC;
+ type = AVMEDIA_TYPE_AUDIO;
+ } else if (es_type == STREAM_TYPE_VIDEO_MPEG4) {
+ codec_id = AV_CODEC_ID_MPEG4;
+ type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_VIDEO_H264) {
+ codec_id = AV_CODEC_ID_H264;
+ type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_VIDEO_HEVC) {
+ codec_id = AV_CODEC_ID_HEVC;
+ type = AVMEDIA_TYPE_VIDEO;
+ } else if (es_type == STREAM_TYPE_AUDIO_AC3) {
+ codec_id = AV_CODEC_ID_AC3;
+ type = AVMEDIA_TYPE_AUDIO;
+ } else if (m->imkh_cctv && es_type == 0x91) {
+ codec_id = AV_CODEC_ID_PCM_MULAW;
+ type = AVMEDIA_TYPE_AUDIO;
} else if (startcode >= 0x1e0 && startcode <= 0x1ef) {
static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 };
unsigned char buf[8];
codec_id = AV_CODEC_ID_DTS;
} else if (startcode >= 0xa0 && startcode <= 0xaf) {
type = AVMEDIA_TYPE_AUDIO;
- if (lpcm_header_len == 6 || startcode == 0xa1) {
+ if (lpcm_header_len >= 6 && startcode == 0xa1) {
codec_id = AV_CODEC_ID_MLP;
} else {
codec_id = AV_CODEC_ID_PCM_DVD;
pkt->stream_index = st->index;
if (s->debug & FF_FDEBUG_TS)
- av_log(s, AV_LOG_TRACE, "%d: pts=%0.3f dts=%0.3f size=%d\n",
+ av_log(s, AV_LOG_DEBUG, "%d: pts=%0.3f dts=%0.3f size=%d\n",
pkt->stream_index, pkt->pts / 90000.0, pkt->dts / 90000.0,
pkt->size);
len = mpegps_read_pes_header(s, &pos, &startcode, &pts, &dts);
if (len < 0) {
if (s->debug & FF_FDEBUG_TS)
- av_log(s, AV_LOG_TRACE, "none (ret=%d)\n", len);
+ av_log(s, AV_LOG_DEBUG, "none (ret=%d)\n", len);
return AV_NOPTS_VALUE;
}
if (startcode == s->streams[stream_index]->id &&
avio_skip(s->pb, len);
}
if (s->debug & FF_FDEBUG_TS)
- av_log(s, AV_LOG_TRACE, "pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n",
+ av_log(s, AV_LOG_DEBUG, "pos=0x%"PRIx64" dts=0x%"PRIx64" %0.3f\n",
pos, dts, dts / 90000.0);
*ppos = pos;
return dts;
#define REF_STRING "# VobSub index file,"
#define MAX_LINE_SIZE 2048
-static int vobsub_probe(AVProbeData *p)
+static int vobsub_probe(const AVProbeData *p)
{
if (!strncmp(p->buf, REF_STRING, sizeof(REF_STRING) - 1))
return AVPROBE_SCORE_MAX;
int stream_id = -1;
char id[64] = {0};
char alt[MAX_LINE_SIZE] = {0};
- AVInputFormat *iformat;
+ ff_const59 AVInputFormat *iformat;
if (!vobsub->sub_name) {
char *ext;