summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-11-04 16:28:47 +0100
committerGitHub <noreply@github.com>2023-11-04 16:28:47 +0100
commit940618a64dc048790291e240dca6a085a4f1c27c (patch)
tree6d41f305300d241769ff693d9e417ffb9b5b8edc
parentMerge pull request #11960 from german77/silence (diff)
parentAllow 0 stereo count (diff)
downloadyuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar.gz
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar.bz2
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar.lz
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar.xz
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.tar.zst
yuzu-940618a64dc048790291e240dca6a085a4f1c27c.zip
-rw-r--r--src/audio_core/adsp/apps/opus/opus_decoder.cpp4
-rw-r--r--src/audio_core/opus/decoder_manager.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/audio_core/adsp/apps/opus/opus_decoder.cpp b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
index 2084de128..75f0fb9ad 100644
--- a/src/audio_core/adsp/apps/opus/opus_decoder.cpp
+++ b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
@@ -30,9 +30,9 @@ bool IsValidMultiStreamChannelCount(u32 channel_count) {
return channel_count <= OpusStreamCountMax;
}
-bool IsValidMultiStreamStreamCounts(s32 total_stream_count, s32 sterero_stream_count) {
+bool IsValidMultiStreamStreamCounts(s32 total_stream_count, s32 stereo_stream_count) {
return IsValidMultiStreamChannelCount(total_stream_count) && total_stream_count > 0 &&
- sterero_stream_count > 0 && sterero_stream_count <= total_stream_count;
+ stereo_stream_count >= 0 && stereo_stream_count <= total_stream_count;
}
} // namespace
diff --git a/src/audio_core/opus/decoder_manager.cpp b/src/audio_core/opus/decoder_manager.cpp
index 4a5382973..fdeccdf50 100644
--- a/src/audio_core/opus/decoder_manager.cpp
+++ b/src/audio_core/opus/decoder_manager.cpp
@@ -24,7 +24,7 @@ bool IsValidSampleRate(u32 sample_rate) {
}
bool IsValidStreamCount(u32 channel_count, u32 total_stream_count, u32 stereo_stream_count) {
- return total_stream_count > 0 && stereo_stream_count > 0 &&
+ return total_stream_count > 0 && static_cast<s32>(stereo_stream_count) >= 0 &&
stereo_stream_count <= total_stream_count &&
total_stream_count + stereo_stream_count <= channel_count;
}