virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/mpeg: better fix for MLP versus PCM-DVD misdetection

Browse Source
This commit is contained in:
Paul B Mahol 2019-10-01 11:34:09 +02:00
parent 7c145b6441
commit 7da57875b5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mpeg.c
View File

@ -490,6 +490,7 @@ static int mpegps_read_packet(AVFormatContext *s,
AVStream *st; AVStream *st;
int len, startcode, i, es_type, ret; int len, startcode, i, es_type, ret;
int lpcm_header_len = -1; //Init to suppress warning int lpcm_header_len = -1; //Init to suppress warning
int pcm_dvd = 0;
int request_probe= 0; int request_probe= 0;
enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum AVCodecID codec_id = AV_CODEC_ID_NONE;
enum AVMediaType type; enum AVMediaType type;
@ -513,6 +514,12 @@ redo:
/* MLP/TrueHD audio has a 4-byte header */ /* MLP/TrueHD audio has a 4-byte header */
avio_r8(s->pb); avio_r8(s->pb);
len--; len--;
} else if (startcode >= 0xa0 && startcode <= 0xaf) {
ret = ffio_ensure_seekback(s->pb, 3);
if (ret < 0)
return ret;
pcm_dvd = (avio_rb24(s->pb) & 0xFF) == 0x80;
avio_skip(s->pb, -3);
} }
} }
} }
@ -591,7 +598,7 @@ redo:
codec_id = AV_CODEC_ID_DTS; codec_id = AV_CODEC_ID_DTS;
} else if (startcode >= 0xa0 && startcode <= 0xaf) { } else if (startcode >= 0xa0 && startcode <= 0xaf) {
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;
if (lpcm_header_len >= 6 && startcode == 0xa1) { if (!pcm_dvd) {
codec_id = AV_CODEC_ID_MLP; codec_id = AV_CODEC_ID_MLP;
} else { } else {
codec_id = AV_CODEC_ID_PCM_DVD; codec_id = AV_CODEC_ID_PCM_DVD;