*/
#include "avformat.h"
+#include "avio_internal.h"
#include "internal.h"
#include "mpeg.h"
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--;
+ }
}
}
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;