From a4508e85e8b63e085eac9dca877fae9f7d65e09a Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 23 Apr 2017 18:05:21 -0700 Subject: AudioCommon: move DPL2 decoding into Mixer --- Source/Core/AudioCommon/CubebStream.cpp | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'Source/Core/AudioCommon/CubebStream.cpp') diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp index c9052e29c9..272060cd74 100644 --- a/Source/Core/AudioCommon/CubebStream.cpp +++ b/Source/Core/AudioCommon/CubebStream.cpp @@ -21,29 +21,9 @@ long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void auto* self = static_cast(user_data); if (self->m_stereo) - { self->m_mixer->Mix(static_cast(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(num_frames) * 2; ++i) - self->m_floatstereo_buffer[i] = self->m_short_buffer[i] / static_cast(1 << 15); - - // DPL2Decode output: LEFTFRONT, RIGHTFRONT, CENTREFRONT, (sub), LEFTREAR, RIGHTREAR - DPL2Decode(self->m_floatstereo_buffer.data(), num_frames, static_cast(output_buffer)); - } + self->m_mixer->MixSurround(static_cast(output_buffer), num_frames); return num_frames; } -- cgit v1.2.3