diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-18 02:41:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-18 02:41:50 +0100 |
| commit | 71f53b421828160a177d87974197b619b2c443fd (patch) | |
| tree | dfc0845449de0cd09093b42f795ca6338bd047cf | |
| parent | Merge pull request #11912 from liamwhite/nv-graphic-buffer (diff) | |
| parent | opus: fix stereo stream count check in multistream decoder object (diff) | |
| download | yuzu-71f53b421828160a177d87974197b619b2c443fd.tar yuzu-71f53b421828160a177d87974197b619b2c443fd.tar.gz yuzu-71f53b421828160a177d87974197b619b2c443fd.tar.bz2 yuzu-71f53b421828160a177d87974197b619b2c443fd.tar.lz yuzu-71f53b421828160a177d87974197b619b2c443fd.tar.xz yuzu-71f53b421828160a177d87974197b619b2c443fd.tar.zst yuzu-71f53b421828160a177d87974197b619b2c443fd.zip | |
| -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) { } 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 && |