Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
5af250cf
Commit
5af250cf
authored
Jul 03, 2021
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for passing in a NULL channel map to the converter.
parent
8d00d9f5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
miniaudio.h
miniaudio.h
+5
-5
No files found.
miniaudio.h
View file @
5af250cf
...
@@ -1922,7 +1922,7 @@ typedef enum
...
@@ -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
...
@@ -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) {
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment