piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

AudioCommon: move DPL2 decoding into Mixer

Browse Source
This commit is contained in:
Michael Maltese
2017-04-23 18:05:21 -07:00
parent 0e6bd74ed6
commit a4508e85e8
5 changed files with 43 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/AudioCommon/CubebStream.cpp
View File

@ -21,29 +21,9 @@ long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void
auto* self = static_cast<CubebStream*>(user_data);
if (self->m_stereo)
{
self->m_mixer->Mix(static_cast<short*>(output_buffer), num_frames);
}
else
{
size_t required_capacity = num_frames * 2;
if (required_capacity > self->m_short_buffer.capacity() ||
required_capacity > self->m_floatstereo_buffer.capacity())
{
INFO_LOG(AUDIO, "Expanding conversion buffers size: %li frames", num_frames);
self->m_short_buffer.reserve(required_capacity);
self->m_floatstereo_buffer.reserve(required_capacity);
}
self->m_mixer->Mix(self->m_short_buffer.data(), num_frames);
// s16 to float
for (size_t i = 0; i < static_cast<size_t>(num_frames) * 2; ++i)
self->m_floatstereo_buffer[i] = self->m_short_buffer[i] / static_cast<float>(1 << 15);
// DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR
DPL2Decode(self->m_floatstereo_buffer.data(), num_frames, static_cast<float*>(output_buffer));
}
self->m_mixer->MixSurround(static_cast<float*>(output_buffer), num_frames);
return num_frames;
}