piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -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/Mixer.cpp
View File

@ -7,6 +7,7 @@
#include <cmath>
#include <cstring>
#include "AudioCommon/DPL2Decoder.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/MathUtil.h"
@ -25,6 +26,8 @@ CMixer::CMixer(unsigned int BackendSampleRate) : m_sampleRate(BackendSampleRate)
m_sound_touch.setSetting(SETTING_SEQUENCE_MS, 62);
m_sound_touch.setSetting(SETTING_SEEKWINDOW_MS, 28);
m_sound_touch.setSetting(SETTING_OVERLAP_MS, 8);
DPL2Reset();
}
CMixer::~CMixer()
@ -159,6 +162,25 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples)
return num_samples;
}
unsigned int CMixer::MixSurround(float* samples, unsigned int num_samples)
{
if (!num_samples)
return 0;
memset(samples, 0, num_samples * 6 * sizeof(float));
unsigned int available_samples = Mix(m_stretch_buffer.data(), num_samples);
for (size_t i = 0; i < static_cast<size_t>(available_samples) * 2; ++i)
{
m_float_conversion_buffer[i] =
m_stretch_buffer[i] / static_cast<float>(std::numeric_limits<short>::max());
}
DPL2Decode(m_float_conversion_buffer.data(), available_samples, samples);
return available_samples;
}
void CMixer::StretchAudio(const short* in, unsigned int num_in, short* out, unsigned int num_out)
{
const double time_delta = static_cast<double>(num_out) / m_sampleRate; // seconds