Mirrors
/
Cemu
mirror of https://github.com/cemu-project/Cemu.git
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sndcore: Write log message instead of asserting in AXSetDeviceRemixMatrix 

Fixes a crash in Watch Dogs due to the non-debug assert
This commit is contained in:
Exzap 2024-05-05 01:27:39 +02:00
parent 91a010fbdd
commit 48d2a8371b
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Cafe/OS/libs/snd_core/ax_ist.cpp
View File

@ -218,21 +218,36 @@ namespace snd_core
// validate parameters // validate parameters
if (deviceId == AX_DEV_TV) if (deviceId == AX_DEV_TV)
{ {
cemu_assert(inputChannelCount <= AX_TV_CHANNEL_COUNT); if(inputChannelCount > AX_TV_CHANNEL_COUNT)
cemu_assert(outputChannelCount == 1 || outputChannelCount == 2 || outputChannelCount == 6); {
cemuLog_log(LogType::APIErrors, "AXSetDeviceRemixMatrix: Input channel count must be smaller or equal to 6 for TV device");
return -7;
}
if(outputChannelCount != 1 && outputChannelCount != 2 && outputChannelCount != 6)
{
// seems like Watch Dogs uses 4 as outputChannelCount for some reason?
cemuLog_log(LogType::APIErrors, "AXSetDeviceRemixMatrix: Output channel count must be 1, 2 or 6 for TV device");
return -8;
}
} }
else if (deviceId == AX_DEV_DRC) else if (deviceId == AX_DEV_DRC)
{ {
cemu_assert(inputChannelCount <= AX_DRC_CHANNEL_COUNT); if(inputChannelCount > AX_DRC_CHANNEL_COUNT)
cemu_assert(outputChannelCount == 1 || outputChannelCount == 2 || outputChannelCount == 4); {
} cemuLog_log(LogType::APIErrors, "AXSetDeviceRemixMatrix: Input channel count must be smaller or equal to 4 for DRC device");
else if (deviceId == AX_DEV_RMT) return -7;
{ }
cemu_assert(false); if(outputChannelCount != 1 && outputChannelCount != 2 && outputChannelCount != 4)
{
cemuLog_log(LogType::APIErrors, "AXSetDeviceRemixMatrix: Output channel count must be 1, 2 or 4 for DRC device");
return -8;
}
} }
else else
{
cemuLog_log(LogType::APIErrors, "AXSetDeviceRemixMatrix: Only TV (0) and DRC (1) device are supported");
return -1; return -1;
}
auto matrices = g_remix_matrices.GetPtr(); auto matrices = g_remix_matrices.GetPtr();
// test if we already have an entry and just need to update the matrix data // test if we already have an entry and just need to update the matrix data