summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2023-11-17 14:25:31 +0100
committerLiam <byteslice@airmail.cc>2023-11-17 14:26:22 +0100
commitde594995da3c041a5ce1e2240412558d62c07013 (patch)
tree32b4cc8082d700672a18d0b302bd2afd7fea9b8b /src
parentMerge pull request #12055 from german77/activate (diff)
downloadyuzu-de594995da3c041a5ce1e2240412558d62c07013.tar
yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.gz
yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.bz2
yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.lz
yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.xz
yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.zst
yuzu-de594995da3c041a5ce1e2240412558d62c07013.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp2
-rw-r--r--src/audio_core/opus/decoder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp b/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp
index 7f1ed0450..05cf3975d 100644
--- a/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp
+++ b/src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp
@@ -12,7 +12,7 @@ bool IsValidChannelCount(u32 channel_count) {
}
bool IsValidStreamCounts(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 && IsValidChannelCount(total_stream_count);
}
} // namespace
diff --git a/src/audio_core/opus/decoder.cpp b/src/audio_core/opus/decoder.cpp
index c6fd45f47..b7fed5304 100644
--- a/src/audio_core/opus/decoder.cpp
+++ b/src/audio_core/opus/decoder.cpp
@@ -148,7 +148,7 @@ Result OpusDecoder::DecodeInterleavedForMultiStream(u32* out_data_size, u64* out
auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())};
OpusPacketHeader header{ReverseHeader(*header_p)};
- LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
+ LOG_TRACE(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}",
header.size, input_data.size_bytes(), in_data.size_bytes());
R_UNLESS(in_data.size_bytes() >= header.size &&