RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

audio: use unknown channel layouts if there is no standard layout 

This is just a conceptual issue, since for now every channel count has
an associated standard layout.

But should the max. channel count ever be bumped, some things would stop
function if mp_chmap_from_channels() refused to work for any channel
count within the allowed range.
This commit is contained in:
wm4 2015-06-12 17:45:56 +02:00
parent 11fee81a7a
commit c890eeac47
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/chmap.c
View File

@ -97,7 +97,7 @@ static const char *const std_layout_names[][2] = {
{0} {0}
}; };
static const struct mp_chmap default_layouts[MP_NUM_CHANNELS + 1] = { static const struct mp_chmap default_layouts[] = {
{0}, // empty {0}, // empty
MP_CHMAP_INIT_MONO, // mono MP_CHMAP_INIT_MONO, // mono
MP_CHMAP2(FL, FR), // stereo MP_CHMAP2(FL, FR), // stereo
@ -217,11 +217,11 @@ void mp_chmap_fill_na(struct mp_chmap *map, int num)
// mp_chmap_is_valid(dst) will return false. // mp_chmap_is_valid(dst) will return false.
void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels) void mp_chmap_from_channels(struct mp_chmap *dst, int num_channels)
{ {
if (num_channels < 0 || num_channels > MP_NUM_CHANNELS) { *dst = (struct mp_chmap) {0};
*dst = (struct mp_chmap) {0}; if (num_channels >= 0 && num_channels < MP_ARRAY_SIZE(default_layouts))
} else {
*dst = default_layouts[num_channels]; *dst = default_layouts[num_channels];
} if (!dst->num)
mp_chmap_set_unknown(dst, num_channels);
} }
// Try to do what mplayer/mplayer2/mpv did before channel layouts were // Try to do what mplayer/mplayer2/mpv did before channel layouts were