From d8882bbfb76fd9973134d0cb59b9dda064225354 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 11 Nov 2013 18:40:59 +0100 Subject: demux_mkv: support some raw PCM variants This affects 64 bit floats and big endian integer PCM variants (basically crap nobody uses). Possibly not all MS-muxed files work, but I couldn't get or produce any samples. Remove a bunch of format tags that are not needed anymore. Most of these were used by demux_mov, which is long gone. Repurpose/abuse 'twos' as mpv-internal tag for dealing with the PCM variants mentioned above. --- demux/codec_tags.c | 1 - demux/demux_mkv.c | 5 +++-- demux/matroska.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'demux') diff --git a/demux/codec_tags.c b/demux/codec_tags.c index 66489aae03..dbf384fdbd 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -132,7 +132,6 @@ static const struct mp_codec_tag mp_audio_codec_tags[] = { {MKTAG('B', 'P', 'C', 'M'), "pcm_bluray"}, {MKTAG('P', 'L', 'X', 'F'), "pcm_lxf"}, {MKTAG('T', 'W', 'I', '2'), "twinvq"}, - {0x20776172, "pcm"}, // demux_mpg.c dvdpcm {0}, }; diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 7a9aaa0f87..7a30721e66 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1355,6 +1355,7 @@ static struct mkv_audio_tag { { MKV_A_DTS, 0, 0x2001 }, { MKV_A_PCM, 0, 0x0001 }, { MKV_A_PCM_BE, 0, 0x0001 }, + { MKV_A_PCM_FLT, 0, 0x0003 }, { MKV_A_AAC_2MAIN, 0, MP_FOURCC('M', 'P', '4', 'A') }, { MKV_A_AAC_2LC, 1, MP_FOURCC('M', 'P', '4', 'A') }, { MKV_A_AAC_2SSR, 0, MP_FOURCC('M', 'P', '4', 'A') }, @@ -1464,10 +1465,10 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) free(sh_a->wf); sh_a->wf = NULL; } else if (track->a_formattag == 0x0001) { /* PCM || PCM_BE */ - sh_a->wf->nAvgBytesPerSec = sh_a->channels.num * sh_a->samplerate * 2; - sh_a->wf->nBlockAlign = sh_a->wf->nAvgBytesPerSec; if (!strcmp(track->codec_id, MKV_A_PCM_BE)) sh_a->format = MP_FOURCC('t', 'w', 'o', 's'); + } else if (track->a_formattag == 0x0003) { /* PCM_FLT */ + /* ok */ } else if (!strcmp(track->codec_id, MKV_A_QDMC) || !strcmp(track->codec_id, MKV_A_QDMC2)) { sh_a->wf->nAvgBytesPerSec = 16000; diff --git a/demux/matroska.h b/demux/matroska.h index 796f6c24d3..a6be019b2d 100644 --- a/demux/matroska.h +++ b/demux/matroska.h @@ -40,6 +40,7 @@ #define MKV_A_MP3 "A_MPEG/L3" #define MKV_A_PCM "A_PCM/INT/LIT" #define MKV_A_PCM_BE "A_PCM/INT/BIG" +#define MKV_A_PCM_FLT "A_PCM/FLOAT/IEEE" #define MKV_A_VORBIS "A_VORBIS" #define MKV_A_OPUS "A_OPUS" #define MKV_A_OPUS_EXP "A_OPUS/EXPERIMENTAL" -- cgit v1.2.3