diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-04 11:28:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 11:28:47 -0400 |
| commit | 940618a64dc048790291e240dca6a085a4f1c27c (patch) | |
| tree | 6d41f305300d241769ff693d9e417ffb9b5b8edc | |
| parent | 409fa5dda27b0927bcdf7fe0fd74b6ab04a9b119 (diff) | |
| parent | a294beb116026ba15ed90299308ea47e4775c1e5 (diff) | |
Merge pull request #11952 from liamwhite/opus_stereo_count
opus: Allow 0 stereo count
| -rw-r--r-- | src/audio_core/adsp/apps/opus/opus_decoder.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/opus/decoder_manager.cpp | 2 |
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 2084de1285..75f0fb9ad9 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 4a5382973a..fdeccdf50b 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;
}
|