diff options
| author |  bunnei | 2018-11-03 00:29:15 -0400 |
|---|---|---|
| committer |  GitHub | 2018-11-03 00:29:15 -0400 |
| commit | 6664d7b2c5dcff9846e1a77ffa729a53e6261308 (patch) | |
| tree | fb1302ea69400b6fd0e2aab2785e16ee6fdf908a /src | |
| parent | Merge pull request #1615 from lioncash/input (diff) | |
| parent | Fixed incorrect hwopus assert (diff) | |
| download | yuzu-6664d7b2c5dcff9846e1a77ffa729a53e6261308.tar.gz yuzu-6664d7b2c5dcff9846e1a77ffa729a53e6261308.tar.xz yuzu-6664d7b2c5dcff9846e1a77ffa729a53e6261308.zip | |
Merge pull request #1636 from ogniK5377/hwopus-bad-assert
Fixed incorrect hwopus assert
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/audio/hwopus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp index 7168c6a10..783c39503 100644 --- a/src/core/hle/service/audio/hwopus.cpp +++ b/src/core/hle/service/audio/hwopus.cpp | |||
| @@ -161,7 +161,7 @@ void HwOpus::OpenOpusDecoder(Kernel::HLERequestContext& ctx) { | |||
| 161 | ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count"); | 161 | ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count"); |
| 162 | 162 | ||
| 163 | std::size_t worker_sz = WorkerBufferSize(channel_count); | 163 | std::size_t worker_sz = WorkerBufferSize(channel_count); |
| 164 | ASSERT_MSG(buffer_sz < worker_sz, "Worker buffer too large"); | 164 | ASSERT_MSG(buffer_sz >= worker_sz, "Worker buffer too large"); |
| 165 | std::unique_ptr<OpusDecoder, OpusDeleter> decoder{ | 165 | std::unique_ptr<OpusDecoder, OpusDeleter> decoder{ |
| 166 | static_cast<OpusDecoder*>(operator new(worker_sz))}; | 166 | static_cast<OpusDecoder*>(operator new(worker_sz))}; |
| 167 | if (opus_decoder_init(decoder.get(), sample_rate, channel_count)) { | 167 | if (opus_decoder_init(decoder.get(), sample_rate, channel_count)) { |