Amadeus: Fix multi-channel PCM sources on REV8 (#1536)

This add a missing offset on the output buffer of the DataSourceVersion2Command. This fix music only playing on the left channel on Fairy Tail, Family Mysteries: Poisonous Promises, SEGA AGES Sonic the Hedgehog 2 and probably more.
greggameplayer · Sep 6, 2020 · 6aef271 · 6aef271
1 parent e7d09a8
commit 6aef271
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Ryujinx.Audio.Renderer/Dsp/Command/DataSourceVersion2Command.cs b/Ryujinx.Audio.Renderer/Dsp/Command/DataSourceVersion2Command.cs
@@ -63,7 +63,7 @@ public DataSourceVersion2Command(ref Server.Voice.VoiceState serverState, Memory
             SrcQuality = serverState.SrcQuality;
             CommandType = GetCommandTypeBySampleFormat(SampleFormat);
 
-            OutputBufferIndex = outputBufferIndex;
+            OutputBufferIndex = (ushort)(channelIndex + outputBufferIndex);
             SampleRate = serverState.SampleRate;
             Pitch = serverState.Pitch;
 

diff --git a/Ryujinx.Audio.Renderer/Server/CommandGenerator.cs b/Ryujinx.Audio.Renderer/Server/CommandGenerator.cs
@@ -107,6 +107,8 @@ private void GenerateDataSource(ref VoiceState voiceState, Memory<VoiceUpdateSta
 
             if (!voiceState.WasPlaying)
             {
+                Debug.Assert(voiceState.SampleFormat != SampleFormat.Adpcm || channelIndex == 0);
+
                 if (_rendererContext.BehaviourContext.IsWaveBufferVersion2Supported())
                 {
                     _commandBuffer.GenerateDataSourceVersion2(ref voiceState,