diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-17 20:41:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 20:41:50 -0500 |
| commit | 71f53b421828160a177d87974197b619b2c443fd (patch) | |
| tree | dfc0845449de0cd09093b42f795ca6338bd047cf /src | |
| parent | f131b0faeb94a3f5aef76772e75ec3feb7c3ab12 (diff) | |
| parent | de594995da3c041a5ce1e2240412558d62c07013 (diff) | |
Merge pull request #12058 from liamwhite/opus-again
opus: fix stereo stream count check in multistream decoder object
Diffstat (limited to 'src')
| -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 7f1ed04509..05cf3975db 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 c6fd45f474..b7fed53043 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 && |