diff options
| author | 2023-11-17 08:25:31 -0500 | |
|---|---|---|
| committer | 2023-11-17 08:26:22 -0500 | |
| commit | de594995da3c041a5ce1e2240412558d62c07013 (patch) | |
| tree | 32b4cc8082d700672a18d0b302bd2afd7fea9b8b /src/audio_core | |
| parent | Merge pull request #12055 from german77/activate (diff) | |
| download | yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.gz yuzu-de594995da3c041a5ce1e2240412558d62c07013.tar.xz yuzu-de594995da3c041a5ce1e2240412558d62c07013.zip | |
opus: fix stereo stream count check in multistream decoder object
Diffstat (limited to 'src/audio_core')
| -rw-r--r-- | src/audio_core/adsp/apps/opus/opus_multistream_decode_object.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/opus/decoder.cpp | 2 |
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) { | |||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) { | 14 | bool IsValidStreamCounts(u32 total_stream_count, u32 stereo_stream_count) { |
| 15 | return total_stream_count > 0 && stereo_stream_count > 0 && | 15 | return total_stream_count > 0 && static_cast<s32>(stereo_stream_count) >= 0 && |
| 16 | stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count); | 16 | stereo_stream_count <= total_stream_count && IsValidChannelCount(total_stream_count); |
| 17 | } | 17 | } |
| 18 | } // namespace | 18 | } // 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 | |||
| 148 | auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())}; | 148 | auto* header_p{reinterpret_cast<const OpusPacketHeader*>(input_data.data())}; |
| 149 | OpusPacketHeader header{ReverseHeader(*header_p)}; | 149 | OpusPacketHeader header{ReverseHeader(*header_p)}; |
| 150 | 150 | ||
| 151 | LOG_ERROR(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}", | 151 | LOG_TRACE(Service_Audio, "header size 0x{:X} input data size 0x{:X} in_data size 0x{:X}", |
| 152 | header.size, input_data.size_bytes(), in_data.size_bytes()); | 152 | header.size, input_data.size_bytes(), in_data.size_bytes()); |
| 153 | 153 | ||
| 154 | R_UNLESS(in_data.size_bytes() >= header.size && | 154 | R_UNLESS(in_data.size_bytes() >= header.size && |