summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKelebek1 <eeeedddccc@hotmail.co.uk>2023-11-03 16:16:38 +0100
committerLiam <byteslice@airmail.cc>2023-11-03 16:45:40 +0100
commita294beb116026ba15ed90299308ea47e4775c1e5 (patch)
treeaf55e0f062c486872247a90d74be8d954e6b7c68 /src
parentMerge pull request #11948 from german77/hard_ring (diff)
downloadyuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar.gz
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar.bz2
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar.lz
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar.xz
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.tar.zst
yuzu-a294beb116026ba15ed90299308ea47e4775c1e5.zip
Diffstat (limited to 'src')
-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;
}