diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2019-02-12 14:05:05 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 14:05:05 -0300 |
| commit | 8eebbc736e6a6117facb2321a5a8613f4502f92b (patch) | |
| tree | 7da4106be3f3adebf200effaca20e5010c322e01 | |
| parent | d306115750df9df170cfef4d49c6b0b7af498962 (diff) | |
Do not increment played wave buffers count for empty wave buffers (#568)
* Do not increment played wave buffers count for empty wave buffers
* Remove unused setter
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs | 30 |
2 files changed, 18 insertions, 14 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs index 72839c2b..8c984385 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs @@ -312,7 +312,7 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer foreach (VoiceContext voice in _voices) { - if (!voice.Playing) + if (!voice.Playing || voice.CurrentWaveBuffer.Size == 0) { continue; } diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs index a877081d..5de85612 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/VoiceContext.cs @@ -14,20 +14,24 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer private int _bufferIndex; private int _offset; - public int SampleRate; - public int ChannelsCount; + public int SampleRate { get; set; } + public int ChannelsCount { get; set; } - public float Volume; + public float Volume { get; set; } - public PlayState PlayState; + public PlayState PlayState { get; set; } - public SampleFormat SampleFormat; + public SampleFormat SampleFormat { get; set; } - public AdpcmDecoderContext AdpcmCtx; + public AdpcmDecoderContext AdpcmCtx { get; set; } - public WaveBuffer[] WaveBuffers; + public WaveBuffer[] WaveBuffers { get; } - public VoiceOut OutStatus; + public WaveBuffer CurrentWaveBuffer => WaveBuffers[_bufferIndex]; + + private VoiceOut _outStatus; + + public VoiceOut OutStatus => _outStatus; private int[] _samples; @@ -56,9 +60,9 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer _bufferIndex = 0; _offset = 0; - OutStatus.PlayedSamplesCount = 0; - OutStatus.PlayedWaveBuffersCount = 0; - OutStatus.VoiceDropsCount = 0; + _outStatus.PlayedSamplesCount = 0; + _outStatus.PlayedWaveBuffersCount = 0; + _outStatus.VoiceDropsCount = 0; } public int[] GetBufferData(MemoryManager memory, int maxSamples, out int samplesCount) @@ -94,7 +98,7 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer samplesCount = size / AudioConsts.HostChannelsCount; - OutStatus.PlayedSamplesCount += samplesCount; + _outStatus.PlayedSamplesCount += samplesCount; _offset += size; @@ -107,7 +111,7 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer SetBufferIndex((_bufferIndex + 1) & 3); } - OutStatus.PlayedWaveBuffersCount++; + _outStatus.PlayedWaveBuffersCount++; if (wb.LastBuffer != 0) { |