virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

avformat/mpeg: fix detection and demuxing of raw AC3 in mpegps

Browse Source 
Fixes #4889.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-03-30 18:44:34 +02:00
parent 52e97814a1
commit 7643e27528
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavformat/mpeg.c
View File

@ -20,6 +20,7 @@
*/ */
#include "avformat.h" #include "avformat.h"
#include "avio_internal.h"
#include "internal.h" #include "internal.h"
#include "mpeg.h" #include "mpeg.h"
@ -128,6 +129,7 @@ typedef struct MpegDemuxContext {
int sofdec; int sofdec;
int dvd; int dvd;
int imkh_cctv; int imkh_cctv;
int raw_ac3;
#if CONFIG_VOBSUB_DEMUXER #if CONFIG_VOBSUB_DEMUXER
AVFormatContext *sub_ctx; AVFormatContext *sub_ctx;
FFDemuxSubtitlesQueue q[32]; FFDemuxSubtitlesQueue q[32];
@ -442,8 +444,21 @@ redo:
} }
if (startcode == PRIVATE_STREAM_1) { if (startcode == PRIVATE_STREAM_1) {
int ret = ffio_ensure_seekback(s->pb, 2);
if (ret < 0)
return ret;
startcode = avio_r8(s->pb); startcode = avio_r8(s->pb);
len--; if (startcode == 0x0b && avio_r8(s->pb) == 0x77) {
startcode = 0x80;
m->raw_ac3 = 1;
avio_skip(s->pb, -2);
} else {
m->raw_ac3 = 0;
avio_skip(s->pb, -1);
len--;
}
} }
if (len < 0) if (len < 0)
goto error_redo; goto error_redo;
@ -486,14 +501,16 @@ redo:
if (len < 4) if (len < 4)
goto skip; goto skip;
/* audio: skip header */ if (!m->raw_ac3) {
avio_r8(s->pb); /* audio: skip header */
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); 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--;
}
} }
} }