mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-01 02:21:26 +02:00
c1922783f8
Fix Frame Advance and FifoPlayer pause/unpause/stop. CPU::EnableStepping is not atomic but is called from multiple threads which races and leaves the system in a random state; also instruction stepping was unstable, m_StepEvent had an almost random value because of the dual purpose it served which could cause races where CPU::Run would SingleStep when it was supposed to be sleeping. FifoPlayer never FinishStateMove()d which was causing it to deadlock. Rather than partially reimplementing CPU::Run, just use CPUCoreBase and then call CPU::Run(). More DRY and less likely to have weird bugs specific to the player (i.e the previous freezing on pause/stop). Refactor PowerPC::state into CPU since it manages the state of the CPU Thread which is controlled by CPU, not PowerPC. This simplifies the architecture somewhat and eliminates races that can be caused by calling PowerPC state functions directly instead of using CPU's (because they bypassed the EnableStepping lock).
276 lines
7.9 KiB
C++
276 lines
7.9 KiB
C++
// Copyright 2008 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <cstring>
|
|
|
|
#include "AudioCommon/AudioCommon.h"
|
|
#include "AudioCommon/Mixer.h"
|
|
#include "Common/CommonFuncs.h"
|
|
#include "Common/CommonTypes.h"
|
|
#include "Common/MathUtil.h"
|
|
#include "Common/Logging/Log.h"
|
|
#include "Core/ConfigManager.h"
|
|
|
|
#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
|
|
#include <tmmintrin.h>
|
|
#endif
|
|
|
|
CMixer::CMixer(unsigned int BackendSampleRate)
|
|
: m_sampleRate(BackendSampleRate)
|
|
{
|
|
INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized");
|
|
}
|
|
|
|
CMixer::~CMixer()
|
|
{
|
|
}
|
|
|
|
// Executed from sound stream thread
|
|
unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit)
|
|
{
|
|
unsigned int currentSample = 0;
|
|
|
|
// Cache access in non-volatile variable
|
|
// This is the only function changing the read value, so it's safe to
|
|
// cache it locally although it's written here.
|
|
// The writing pointer will be modified outside, but it will only increase,
|
|
// so we will just ignore new written data while interpolating.
|
|
// Without this cache, the compiler wouldn't be allowed to optimize the
|
|
// interpolation loop.
|
|
u32 indexR = m_indexR.load();
|
|
u32 indexW = m_indexW.load();
|
|
|
|
u32 low_waterwark = m_input_sample_rate * SConfig::GetInstance().iTimingVariance / 1000;
|
|
low_waterwark = std::min(low_waterwark, MAX_SAMPLES / 2);
|
|
|
|
float numLeft = (float)(((indexW - indexR) & INDEX_MASK) / 2);
|
|
m_numLeftI = (numLeft + m_numLeftI*(CONTROL_AVG-1)) / CONTROL_AVG;
|
|
float offset = (m_numLeftI - low_waterwark) * CONTROL_FACTOR;
|
|
if (offset > MAX_FREQ_SHIFT) offset = MAX_FREQ_SHIFT;
|
|
if (offset < -MAX_FREQ_SHIFT) offset = -MAX_FREQ_SHIFT;
|
|
|
|
//render numleft sample pairs to samples[]
|
|
//advance indexR with sample position
|
|
//remember fractional offset
|
|
|
|
float emulationspeed = SConfig::GetInstance().m_EmulationSpeed;
|
|
float aid_sample_rate = m_input_sample_rate + offset;
|
|
if (consider_framelimit && emulationspeed > 0.0f)
|
|
{
|
|
aid_sample_rate = aid_sample_rate * emulationspeed;
|
|
}
|
|
|
|
const u32 ratio = (u32)(65536.0f * aid_sample_rate / (float)m_mixer->m_sampleRate);
|
|
|
|
s32 lvolume = m_LVolume.load();
|
|
s32 rvolume = m_RVolume.load();
|
|
|
|
// TODO: consider a higher-quality resampling algorithm.
|
|
for (; currentSample < numSamples * 2 && ((indexW-indexR) & INDEX_MASK) > 2; currentSample += 2)
|
|
{
|
|
u32 indexR2 = indexR + 2; //next sample
|
|
|
|
s16 l1 = Common::swap16(m_buffer[indexR & INDEX_MASK]); //current
|
|
s16 l2 = Common::swap16(m_buffer[indexR2 & INDEX_MASK]); //next
|
|
int sampleL = ((l1 << 16) + (l2 - l1) * (u16)m_frac) >> 16;
|
|
sampleL = (sampleL * lvolume) >> 8;
|
|
sampleL += samples[currentSample + 1];
|
|
samples[currentSample + 1] = MathUtil::Clamp(sampleL, -32767, 32767);
|
|
|
|
s16 r1 = Common::swap16(m_buffer[(indexR + 1) & INDEX_MASK]); //current
|
|
s16 r2 = Common::swap16(m_buffer[(indexR2 + 1) & INDEX_MASK]); //next
|
|
int sampleR = ((r1 << 16) + (r2 - r1) * (u16)m_frac) >> 16;
|
|
sampleR = (sampleR * rvolume) >> 8;
|
|
sampleR += samples[currentSample];
|
|
samples[currentSample] = MathUtil::Clamp(sampleR, -32767, 32767);
|
|
|
|
m_frac += ratio;
|
|
indexR += 2 * (u16)(m_frac >> 16);
|
|
m_frac &= 0xffff;
|
|
}
|
|
|
|
// Padding
|
|
short s[2];
|
|
s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
|
|
s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
|
|
s[0] = (s[0] * rvolume) >> 8;
|
|
s[1] = (s[1] * lvolume) >> 8;
|
|
for (; currentSample < numSamples * 2; currentSample += 2)
|
|
{
|
|
int sampleR = MathUtil::Clamp(s[0] + samples[currentSample + 0], -32767, 32767);
|
|
int sampleL = MathUtil::Clamp(s[1] + samples[currentSample + 1], -32767, 32767);
|
|
|
|
samples[currentSample + 0] = sampleR;
|
|
samples[currentSample + 1] = sampleL;
|
|
}
|
|
|
|
// Flush cached variable
|
|
m_indexR.store(indexR);
|
|
|
|
return numSamples;
|
|
}
|
|
|
|
unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider_framelimit)
|
|
{
|
|
if (!samples)
|
|
return 0;
|
|
|
|
memset(samples, 0, num_samples * 2 * sizeof(short));
|
|
|
|
m_dma_mixer.Mix(samples, num_samples, consider_framelimit);
|
|
m_streaming_mixer.Mix(samples, num_samples, consider_framelimit);
|
|
m_wiimote_speaker_mixer.Mix(samples, num_samples, consider_framelimit);
|
|
return num_samples;
|
|
}
|
|
|
|
void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_samples)
|
|
{
|
|
// Cache access in non-volatile variable
|
|
// indexR isn't allowed to cache in the audio throttling loop as it
|
|
// needs to get updates to not deadlock.
|
|
u32 indexW = m_indexW.load();
|
|
|
|
// Check if we have enough free space
|
|
// indexW == m_indexR results in empty buffer, so indexR must always be smaller than indexW
|
|
if (num_samples * 2 + ((indexW - m_indexR.load()) & INDEX_MASK) >= MAX_SAMPLES * 2)
|
|
return;
|
|
|
|
// AyuanX: Actual re-sampling work has been moved to sound thread
|
|
// to alleviate the workload on main thread
|
|
// and we simply store raw data here to make fast mem copy
|
|
int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (indexW & INDEX_MASK)) * sizeof(short);
|
|
if (over_bytes > 0)
|
|
{
|
|
memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
|
|
memcpy(&m_buffer[0], samples + (num_samples * 4 - over_bytes) / sizeof(short), over_bytes);
|
|
}
|
|
else
|
|
{
|
|
memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4);
|
|
}
|
|
|
|
m_indexW.fetch_add(num_samples * 2);
|
|
}
|
|
|
|
void CMixer::PushSamples(const short *samples, unsigned int num_samples)
|
|
{
|
|
m_dma_mixer.PushSamples(samples, num_samples);
|
|
if (m_log_dsp_audio)
|
|
m_wave_writer_dsp.AddStereoSamplesBE(samples, num_samples);
|
|
}
|
|
|
|
void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples)
|
|
{
|
|
m_streaming_mixer.PushSamples(samples, num_samples);
|
|
if (m_log_dtk_audio)
|
|
m_wave_writer_dtk.AddStereoSamplesBE(samples, num_samples);
|
|
}
|
|
|
|
void CMixer::PushWiimoteSpeakerSamples(const short *samples, unsigned int num_samples, unsigned int sample_rate)
|
|
{
|
|
short samples_stereo[MAX_SAMPLES * 2];
|
|
|
|
if (num_samples < MAX_SAMPLES)
|
|
{
|
|
m_wiimote_speaker_mixer.SetInputSampleRate(sample_rate);
|
|
|
|
for (unsigned int i = 0; i < num_samples; ++i)
|
|
{
|
|
samples_stereo[i * 2] = Common::swap16(samples[i]);
|
|
samples_stereo[i * 2 + 1] = Common::swap16(samples[i]);
|
|
}
|
|
|
|
m_wiimote_speaker_mixer.PushSamples(samples_stereo, num_samples);
|
|
}
|
|
}
|
|
|
|
void CMixer::SetDMAInputSampleRate(unsigned int rate)
|
|
{
|
|
m_dma_mixer.SetInputSampleRate(rate);
|
|
}
|
|
|
|
void CMixer::SetStreamInputSampleRate(unsigned int rate)
|
|
{
|
|
m_streaming_mixer.SetInputSampleRate(rate);
|
|
}
|
|
|
|
void CMixer::SetStreamingVolume(unsigned int lvolume, unsigned int rvolume)
|
|
{
|
|
m_streaming_mixer.SetVolume(lvolume, rvolume);
|
|
}
|
|
|
|
void CMixer::SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume)
|
|
{
|
|
m_wiimote_speaker_mixer.SetVolume(lvolume, rvolume);
|
|
}
|
|
|
|
void CMixer::StartLogDTKAudio(const std::string& filename)
|
|
{
|
|
if (!m_log_dtk_audio)
|
|
{
|
|
m_log_dtk_audio = true;
|
|
m_wave_writer_dtk.Start(filename, 48000);
|
|
m_wave_writer_dtk.SetSkipSilence(false);
|
|
NOTICE_LOG(AUDIO, "Starting DTK Audio logging");
|
|
}
|
|
else
|
|
{
|
|
WARN_LOG(AUDIO, "DTK Audio logging has already been started");
|
|
}
|
|
}
|
|
|
|
void CMixer::StopLogDTKAudio()
|
|
{
|
|
if (m_log_dtk_audio)
|
|
{
|
|
m_log_dtk_audio = false;
|
|
m_wave_writer_dtk.Stop();
|
|
NOTICE_LOG(AUDIO, "Stopping DTK Audio logging");
|
|
}
|
|
else
|
|
{
|
|
WARN_LOG(AUDIO, "DTK Audio logging has already been stopped");
|
|
}
|
|
}
|
|
|
|
void CMixer::StartLogDSPAudio(const std::string& filename)
|
|
{
|
|
if (!m_log_dsp_audio)
|
|
{
|
|
m_log_dsp_audio = true;
|
|
m_wave_writer_dsp.Start(filename, 32000);
|
|
m_wave_writer_dsp.SetSkipSilence(false);
|
|
NOTICE_LOG(AUDIO, "Starting DSP Audio logging");
|
|
}
|
|
else
|
|
{
|
|
WARN_LOG(AUDIO, "DSP Audio logging has already been started");
|
|
}
|
|
}
|
|
|
|
void CMixer::StopLogDSPAudio()
|
|
{
|
|
if (m_log_dsp_audio)
|
|
{
|
|
m_log_dsp_audio = false;
|
|
m_wave_writer_dsp.Stop();
|
|
NOTICE_LOG(AUDIO, "Stopping DSP Audio logging");
|
|
}
|
|
else
|
|
{
|
|
WARN_LOG(AUDIO, "DSP Audio logging has already been stopped");
|
|
}
|
|
}
|
|
|
|
void CMixer::MixerFifo::SetInputSampleRate(unsigned int rate)
|
|
{
|
|
m_input_sample_rate = rate;
|
|
}
|
|
|
|
void CMixer::MixerFifo::SetVolume(unsigned int lvolume, unsigned int rvolume)
|
|
{
|
|
m_LVolume.store(lvolume + (lvolume >> 7));
|
|
m_RVolume.store(rvolume + (rvolume >> 7));
|
|
}
|