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
f6e5cf10
Commit
f6e5cf10
authored
Jun 25, 2022
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a crash when initializing a channel converter.
Public issue
https://github.com/mackron/miniaudio/issues/482
parent
0788be81
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
CHANGES.md
CHANGES.md
+1
-0
miniaudio.h
miniaudio.h
+4
-4
No files found.
CHANGES.md
View file @
f6e5cf10
v0.11.10 - TBD
v0.11.10 - TBD
=====================
=====================
*
Add support for setting the device notification callback when initializing an engine object.
*
Add support for setting the device notification callback when initializing an engine object.
*
Fix a crash when initializing a channel converter.
v0.11.9 - 2022-04-20
v0.11.9 - 2022-04-20
...
...
miniaudio.h
View file @
f6e5cf10
...
@@ -51185,12 +51185,12 @@ MA_API ma_result ma_channel_converter_init_preallocated(const ma_channel_convert
...
@@ -51185,12 +51185,12 @@ MA_API ma_result ma_channel_converter_init_preallocated(const ma_channel_convert
{
{
/* Unmapped input channels. */
/* Unmapped input channels. */
for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; ++iChannelIn) {
for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; ++iChannelIn) {
ma_channel channelPosIn =
pConverter->pChannelMapIn[iChannelIn]
;
ma_channel channelPosIn =
ma_channel_map_get_channel(pConverter->pChannelMapIn, pConverter->channelsIn, iChannelIn)
;
if (ma_is_spatial_channel_position(channelPosIn)) {
if (ma_is_spatial_channel_position(channelPosIn)) {
if (!ma_channel_map_contains_channel_position(pConverter->channelsOut, pConverter->pChannelMapOut, channelPosIn)) {
if (!ma_channel_map_contains_channel_position(pConverter->channelsOut, pConverter->pChannelMapOut, channelPosIn)) {
for (iChannelOut = 0; iChannelOut < pConverter->channelsOut; ++iChannelOut) {
for (iChannelOut = 0; iChannelOut < pConverter->channelsOut; ++iChannelOut) {
ma_channel channelPosOut =
pConverter->pChannelMapOut[iChannelOut]
;
ma_channel channelPosOut =
ma_channel_map_get_channel(pConverter->pChannelMapOut, pConverter->channelsOut, iChannelOut)
;
if (ma_is_spatial_channel_position(channelPosOut)) {
if (ma_is_spatial_channel_position(channelPosOut)) {
float weight = 0;
float weight = 0;
...
@@ -51216,12 +51216,12 @@ MA_API ma_result ma_channel_converter_init_preallocated(const ma_channel_convert
...
@@ -51216,12 +51216,12 @@ MA_API ma_result ma_channel_converter_init_preallocated(const ma_channel_convert
/* Unmapped output channels. */
/* Unmapped output channels. */
for (iChannelOut = 0; iChannelOut < pConverter->channelsOut; ++iChannelOut) {
for (iChannelOut = 0; iChannelOut < pConverter->channelsOut; ++iChannelOut) {
ma_channel channelPosOut =
pConverter->pChannelMapOut[iChannelOut]
;
ma_channel channelPosOut =
ma_channel_map_get_channel(pConverter->pChannelMapOut, pConverter->channelsOut, iChannelOut)
;
if (ma_is_spatial_channel_position(channelPosOut)) {
if (ma_is_spatial_channel_position(channelPosOut)) {
if (!ma_channel_map_contains_channel_position(pConverter->channelsIn, pConverter->pChannelMapIn, channelPosOut)) {
if (!ma_channel_map_contains_channel_position(pConverter->channelsIn, pConverter->pChannelMapIn, channelPosOut)) {
for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; ++iChannelIn) {
for (iChannelIn = 0; iChannelIn < pConverter->channelsIn; ++iChannelIn) {
ma_channel channelPosIn =
pConverter->pChannelMapIn[iChannelIn]
;
ma_channel channelPosIn =
ma_channel_map_get_channel(pConverter->pChannelMapIn, pConverter->channelsIn, iChannelIn)
;
if (ma_is_spatial_channel_position(channelPosIn)) {
if (ma_is_spatial_channel_position(channelPosIn)) {
float weight = 0;
float weight = 0;
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