RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 01:22:30 +00:00
Code Issues Releases Wiki Activity

demux_mkv: support channel layout in VfW muxed PCM

Browse Source 
Fixes #2820.
This commit is contained in:
wm4 2016-02-14 12:42:24 +01:00
parent d3ed550792
commit fa821de8b2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demux/demux_mkv.c
View File

@ -1484,6 +1484,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
unsigned char *extradata = track->private_data; unsigned char *extradata = track->private_data;
unsigned int extradata_len = track->private_size; unsigned int extradata_len = track->private_size;
uint64_t chmask = 0;
if (!track->a_osfreq) if (!track->a_osfreq)
track->a_osfreq = track->a_sfreq; track->a_osfreq = track->a_sfreq;
@ -1516,6 +1517,9 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
extradata_len = track->private_size - 18; extradata_len = track->private_size - 18;
sh_a->bits_per_coded_sample = track->a_bps; sh_a->bits_per_coded_sample = track->a_bps;
mp_set_codec_from_tag(sh_a); mp_set_codec_from_tag(sh_a);
// WAVEFORMATEXTENSIBLE.dwChannelMask
if (sh_a->codec_tag == 0xfffe && extradata_len >= 6)
chmask = AV_RL32(extradata + 2);
} else if (!strcmp(track->codec_id, "A_PCM/INT/LIT")) { } else if (!strcmp(track->codec_id, "A_PCM/INT/LIT")) {
bool sign = sh_a->bits_per_coded_sample > 8; bool sign = sh_a->bits_per_coded_sample > 8;
mp_set_pcm_codec(sh_a, sign, false, sh_a->bits_per_coded_sample, false); mp_set_pcm_codec(sh_a, sign, false, sh_a->bits_per_coded_sample, false);
@ -1635,6 +1639,8 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
if (!sh_a->codec) if (!sh_a->codec)
goto error; goto error;
mp_chmap_from_waveext(&sh_a->channels, chmask);
if (sh_a->channels.num != track->a_channels)
mp_chmap_set_unknown(&sh_a->channels, track->a_channels); mp_chmap_set_unknown(&sh_a->channels, track->a_channels);
const char *codec = sh_a->codec; const char *codec = sh_a->codec;