mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 00:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for passing in a NULL channel map to the converter.

Browse Source
This commit is contained in:
David Reid
2021-07-03 17:34:21 +10:00
parent 8d00d9f5fa
commit 5af250cfea
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+5 -5
View File
@@ -1922,7 +1922,7 @@ typedef enum
ma_channel_mix_mode_simple, /* Drop excess channels; zeroed out extra channels. */ ma_channel_mix_mode_simple, /* Drop excess channels; zeroed out extra channels. */
ma_channel_mix_mode_custom_weights, /* Use custom weights specified in ma_channel_router_config. */ ma_channel_mix_mode_custom_weights, /* Use custom weights specified in ma_channel_router_config. */
ma_channel_mix_mode_planar_blend = ma_channel_mix_mode_rectangular, ma_channel_mix_mode_planar_blend = ma_channel_mix_mode_rectangular,
ma_channel_mix_mode_default = ma_channel_mix_mode_planar_blend ma_channel_mix_mode_default = ma_channel_mix_mode_rectangular
} ma_channel_mix_mode; } ma_channel_mix_mode;
typedef enum typedef enum
@@ -40228,18 +40228,18 @@ MA_API ma_result ma_channel_converter_init(const ma_channel_converter_config* pC
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
if (!ma_channel_map_valid(pConfig->channelsIn, pConfig->channelMapIn)) { if (!ma_channel_map_valid(pConfig->channelsIn, pConfig->channelMapIn) && pConfig->channelMapIn != NULL) {
return MA_INVALID_ARGS; /* Invalid input channel map. */ return MA_INVALID_ARGS; /* Invalid input channel map. */
} }
if (!ma_channel_map_valid(pConfig->channelsOut, pConfig->channelMapOut)) { if (!ma_channel_map_valid(pConfig->channelsOut, pConfig->channelMapOut) && pConfig->channelMapOut != NULL) {
return MA_INVALID_ARGS; /* Invalid output channel map. */ return MA_INVALID_ARGS; /* Invalid output channel map. */
} }
pConverter->format = pConfig->format; pConverter->format = pConfig->format;
pConverter->channelsIn = pConfig->channelsIn; pConverter->channelsIn = pConfig->channelsIn;
pConverter->channelsOut = pConfig->channelsOut; pConverter->channelsOut = pConfig->channelsOut;
ma_channel_map_copy(pConverter->channelMapIn, pConfig->channelMapIn, pConfig->channelsIn); ma_channel_map_copy_or_default(pConverter->channelMapIn, pConfig->channelMapIn, pConfig->channelsIn);
ma_channel_map_copy(pConverter->channelMapOut, pConfig->channelMapOut, pConfig->channelsOut); ma_channel_map_copy_or_default(pConverter->channelMapOut, pConfig->channelMapOut, pConfig->channelsOut);
pConverter->mixingMode = pConfig->mixingMode; pConverter->mixingMode = pConfig->mixingMode;
for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; iChannelIn += 1) { for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; iChannelIn += 1) {