mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-24 08:16:02 +00:00
amadeus: Allow 5.1 sink output (#4894)
* amadeus: Allow 5.1 sink output Also add a simple Stereo to 5.1 change for device sink. Tested against NES - Nintendo Switch Online that output stereo on the audio renderer. * Remove outdated comment
This commit is contained in:
parent
e0544dd9c7
commit
5cbdfbc7a4
2 changed files with 15 additions and 5 deletions
|
@ -65,9 +65,7 @@ namespace Ryujinx.Audio.Renderer.Dsp
|
||||||
{
|
{
|
||||||
OutputDevices = new IHardwareDevice[Constants.AudioRendererSessionCountMax];
|
OutputDevices = new IHardwareDevice[Constants.AudioRendererSessionCountMax];
|
||||||
|
|
||||||
// TODO: Before enabling this, we need up-mixing from stereo to 5.1.
|
uint channelCount = GetHardwareChannelCount(deviceDriver);
|
||||||
// uint channelCount = GetHardwareChannelCount(deviceDriver);
|
|
||||||
uint channelCount = 2;
|
|
||||||
|
|
||||||
for (int i = 0; i < OutputDevices.Length; i++)
|
for (int i = 0; i < OutputDevices.Length; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -67,7 +67,19 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
|
|
||||||
const int sampleCount = Constants.TargetSampleCount;
|
const int sampleCount = Constants.TargetSampleCount;
|
||||||
|
|
||||||
short[] outputBuffer = new short[bufferCount * sampleCount];
|
uint inputCount;
|
||||||
|
|
||||||
|
// In case of upmixing to 5.1, we allocate the right amount.
|
||||||
|
if (bufferCount != channelCount && channelCount == 6)
|
||||||
|
{
|
||||||
|
inputCount = (uint)channelCount;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
inputCount = bufferCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
short[] outputBuffer = new short[inputCount * sampleCount];
|
||||||
|
|
||||||
for (int i = 0; i < bufferCount; i++)
|
for (int i = 0; i < bufferCount; i++)
|
||||||
{
|
{
|
||||||
|
@ -79,7 +91,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
device.AppendBuffer(outputBuffer, InputCount);
|
device.AppendBuffer(outputBuffer, inputCount);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue