deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Aways write voice state as finished playing while proper audren support is not in place

Browse source
This commit is contained in:
gdkchan 2018-06-25 02:04:19 -03:00
parent e7559f128f
commit 7c7ee8f8ca
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Ryujinx.HLE/OsHle/Services/Aud/IAudioRenderer.cs
View file

@ -44,18 +44,18 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
UpdateDataHeader InputDataHeader = AMemoryHelper.Read<UpdateDataHeader>(Context.Memory, InputPosition); UpdateDataHeader InputDataHeader = AMemoryHelper.Read<UpdateDataHeader>(Context.Memory, InputPosition);
int MemoryPoolOffset = Marshal.SizeOf(InputDataHeader) + InputDataHeader.BehaviorSize;
UpdateDataHeader OutputDataHeader = new UpdateDataHeader(); UpdateDataHeader OutputDataHeader = new UpdateDataHeader();
int UpdateHeaderSize = Marshal.SizeOf<UpdateDataHeader>();
OutputDataHeader.Revision = Params.Revision; OutputDataHeader.Revision = Params.Revision;
OutputDataHeader.BehaviorSize = 0xb0; OutputDataHeader.BehaviorSize = 0xb0;
OutputDataHeader.MemoryPoolsSize = (Params.EffectCount + (Params.VoiceCount * 4)) * 0x10; OutputDataHeader.MemoryPoolsSize = (Params.EffectCount + Params.VoiceCount * 4) * 0x10;
OutputDataHeader.VoicesSize = Params.VoiceCount * 0x10; OutputDataHeader.VoicesSize = Params.VoiceCount * 0x10;
OutputDataHeader.EffectsSize = Params.EffectCount * 0x10; OutputDataHeader.EffectsSize = Params.EffectCount * 0x10;
OutputDataHeader.SinksSize = Params.SinkCount * 0x20; OutputDataHeader.SinksSize = Params.SinkCount * 0x20;
OutputDataHeader.PerformanceManagerSize = 0x10; OutputDataHeader.PerformanceManagerSize = 0x10;
OutputDataHeader.TotalSize = Marshal.SizeOf(OutputDataHeader) + OutputDataHeader.TotalSize = UpdateHeaderSize +
OutputDataHeader.BehaviorSize + OutputDataHeader.BehaviorSize +
OutputDataHeader.MemoryPoolsSize + OutputDataHeader.MemoryPoolsSize +
OutputDataHeader.VoicesSize + OutputDataHeader.VoicesSize +
@ -65,21 +65,32 @@ namespace Ryujinx.HLE.OsHle.Services.Aud
AMemoryHelper.Write(Context.Memory, OutputPosition, OutputDataHeader); AMemoryHelper.Write(Context.Memory, OutputPosition, OutputDataHeader);
for (int Offset = 0x40; Offset < 0x40 + OutputDataHeader.MemoryPoolsSize; Offset += 0x10, MemoryPoolOffset += 0x20) int InMemoryPoolOffset = UpdateHeaderSize + InputDataHeader.BehaviorSize;
int OutMemoryPoolOffset = UpdateHeaderSize;
for (int Offset = 0; Offset < OutputDataHeader.MemoryPoolsSize; Offset += 0x10, InMemoryPoolOffset += 0x20)
{ {
MemoryPoolState PoolState = (MemoryPoolState)Context.Memory.ReadInt32(InputPosition + MemoryPoolOffset + 0x10); MemoryPoolState PoolState = (MemoryPoolState)Context.Memory.ReadInt32(InputPosition + InMemoryPoolOffset + 0x10);
//TODO: Figure out what the other values does. //TODO: Figure out what the other values does.
if (PoolState == MemoryPoolState.RequestAttach) if (PoolState == MemoryPoolState.RequestAttach)
{ {
Context.Memory.WriteInt32(OutputPosition + Offset, (int)MemoryPoolState.Attached); Context.Memory.WriteInt32(OutputPosition + OutMemoryPoolOffset + Offset, (int)MemoryPoolState.Attached);
} }
else if (PoolState == MemoryPoolState.RequestDetach) else if (PoolState == MemoryPoolState.RequestDetach)
{ {
Context.Memory.WriteInt32(OutputPosition + Offset, (int)MemoryPoolState.Detached); Context.Memory.WriteInt32(OutputPosition + OutMemoryPoolOffset + Offset, (int)MemoryPoolState.Detached);
} }
} }
int OutVoicesOffset = OutMemoryPoolOffset + OutputDataHeader.MemoryPoolsSize;
for (int Offset = 0; Offset < OutputDataHeader.VoicesSize; Offset += 0x10)
{
Context.Memory.WriteInt32(OutputPosition + OutVoicesOffset + Offset + 8, (int)VoicePlaybackState.Finished);
}
//TODO: We shouldn't be signaling this here. //TODO: We shouldn't be signaling this here.
UpdateEvent.WaitEvent.Set(); UpdateEvent.WaitEvent.Set();

9
Ryujinx.HLE/OsHle/Services/Aud/VoiceState.cs Normal file
View file

@ -0,0 +1,9 @@
namespace Ryujinx.HLE.OsHle.Services.Aud
{
enum VoicePlaybackState : int
{
Playing = 0,
Finished = 1,
Paused = 2
}
}