2013-04-18 03:09:55 +00:00
|
|
|
// Copyright 2013 Dolphin Emulator Project
|
|
|
|
// Licensed under GPLv2
|
|
|
|
// Refer to the license.txt file included.
|
2009-01-17 14:28:09 +00:00
|
|
|
|
2014-02-17 10:18:15 +00:00
|
|
|
#include "AudioCommon/AudioCommon.h"
|
|
|
|
#include "AudioCommon/Mixer.h"
|
|
|
|
#include "Common/Atomic.h"
|
|
|
|
#include "Common/CPUDetect.h"
|
2014-04-11 01:28:19 +00:00
|
|
|
#include "Common/MathUtil.h"
|
2014-02-17 10:18:15 +00:00
|
|
|
#include "Core/ConfigManager.h"
|
2014-02-16 22:13:01 +00:00
|
|
|
#include "Core/Core.h"
|
2014-02-17 10:18:15 +00:00
|
|
|
#include "Core/HW/AudioInterface.h"
|
|
|
|
#include "Core/HW/VideoInterface.h"
|
2011-01-28 18:39:30 +00:00
|
|
|
|
|
|
|
// UGLINESS
|
2014-02-17 10:18:15 +00:00
|
|
|
#include "Core/PowerPC/PowerPC.h"
|
2011-01-28 18:39:30 +00:00
|
|
|
|
2011-01-12 09:34:53 +00:00
|
|
|
#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__)
|
|
|
|
#include <tmmintrin.h>
|
|
|
|
#endif
|
|
|
|
|
2009-12-23 15:34:14 +00:00
|
|
|
// Executed from sound stream thread
|
2014-04-11 01:28:19 +00:00
|
|
|
unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit)
|
2008-12-08 05:25:12 +00:00
|
|
|
{
|
2014-02-06 05:55:45 +00:00
|
|
|
unsigned int currentSample = 0;
|
2010-09-28 21:43:38 +00:00
|
|
|
|
2013-07-11 19:22:38 +00:00
|
|
|
// 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 = Common::AtomicLoad(m_indexR);
|
|
|
|
u32 indexW = Common::AtomicLoad(m_indexW);
|
2013-10-29 05:23:17 +00:00
|
|
|
|
2014-06-14 23:08:21 +00:00
|
|
|
float numLeft = (float)(((indexW - indexR) & INDEX_MASK) / 2);
|
2014-02-06 12:03:40 +00:00
|
|
|
m_numLeftI = (numLeft + m_numLeftI*(CONTROL_AVG-1)) / CONTROL_AVG;
|
|
|
|
float offset = (m_numLeftI - LOW_WATERMARK) * CONTROL_FACTOR;
|
2014-03-10 11:30:55 +00:00
|
|
|
if (offset > MAX_FREQ_SHIFT) offset = MAX_FREQ_SHIFT;
|
|
|
|
if (offset < -MAX_FREQ_SHIFT) offset = -MAX_FREQ_SHIFT;
|
2014-02-06 12:03:40 +00:00
|
|
|
|
2014-02-06 05:55:45 +00:00
|
|
|
//render numleft sample pairs to samples[]
|
|
|
|
//advance indexR with sample position
|
|
|
|
//remember fractional offset
|
2014-02-06 05:38:04 +00:00
|
|
|
|
2014-02-11 13:53:53 +00:00
|
|
|
u32 framelimit = SConfig::GetInstance().m_Framelimit;
|
2014-04-11 01:28:19 +00:00
|
|
|
float aid_sample_rate = m_input_sample_rate + offset;
|
2014-02-13 12:22:29 +00:00
|
|
|
if (consider_framelimit && framelimit > 2)
|
2014-02-11 13:53:53 +00:00
|
|
|
{
|
|
|
|
aid_sample_rate = aid_sample_rate * (framelimit - 1) * 5 / VideoInterface::TargetRefreshRate;
|
|
|
|
}
|
|
|
|
|
2014-02-06 05:55:45 +00:00
|
|
|
static u32 frac = 0;
|
2014-04-11 01:28:19 +00:00
|
|
|
const u32 ratio = (u32)( 65536.0f * aid_sample_rate / (float)m_mixer->m_sampleRate );
|
2014-02-06 05:38:04 +00:00
|
|
|
|
2014-06-26 23:15:18 +00:00
|
|
|
s32 lvolume = m_LVolume;
|
|
|
|
s32 rvolume = m_RVolume;
|
|
|
|
|
2014-05-13 06:34:53 +00:00
|
|
|
// TODO: consider a higher-quality resampling algorithm.
|
2014-02-06 05:55:45 +00:00
|
|
|
for (; currentSample < numSamples*2 && ((indexW-indexR) & INDEX_MASK) > 2; currentSample+=2) {
|
|
|
|
u32 indexR2 = indexR + 2; //next sample
|
2014-02-06 05:38:04 +00:00
|
|
|
|
2014-02-06 05:55:45 +00:00
|
|
|
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)frac) >> 16;
|
2014-06-26 23:15:18 +00:00
|
|
|
sampleL = (sampleL * lvolume) >> 8;
|
2014-04-11 01:28:19 +00:00
|
|
|
sampleL += samples[currentSample + 1];
|
|
|
|
MathUtil::Clamp(&sampleL, -32767, 32767);
|
2014-02-06 05:55:45 +00:00
|
|
|
samples[currentSample+1] = sampleL;
|
2014-02-06 05:38:04 +00:00
|
|
|
|
2014-02-06 05:55:45 +00:00
|
|
|
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)frac) >> 16;
|
2014-06-26 23:15:18 +00:00
|
|
|
sampleR = (sampleR * rvolume) >> 8;
|
2014-04-11 01:28:19 +00:00
|
|
|
sampleR += samples[currentSample];
|
|
|
|
MathUtil::Clamp(&sampleR, -32767, 32767);
|
2014-02-06 05:55:45 +00:00
|
|
|
samples[currentSample] = sampleR;
|
2010-09-28 21:43:38 +00:00
|
|
|
|
2014-02-06 05:55:45 +00:00
|
|
|
frac += ratio;
|
|
|
|
indexR += 2 * (u16)(frac >> 16);
|
|
|
|
frac &= 0xffff;
|
2009-12-23 15:34:14 +00:00
|
|
|
}
|
2009-12-22 07:26:30 +00:00
|
|
|
|
2009-12-23 15:34:14 +00:00
|
|
|
// Padding
|
2014-04-11 01:28:19 +00:00
|
|
|
short s[2];
|
2014-02-06 05:55:45 +00:00
|
|
|
s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
|
|
|
|
s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
|
2014-06-26 23:15:18 +00:00
|
|
|
s[0] = (s[0] * lvolume) >> 8;
|
|
|
|
s[1] = (s[1] * rvolume) >> 8;
|
|
|
|
for (; currentSample < numSamples * 2; currentSample += 2)
|
2011-03-12 22:02:46 +00:00
|
|
|
{
|
2014-04-11 01:28:19 +00:00
|
|
|
int sampleR = s[0] + samples[currentSample];
|
|
|
|
MathUtil::Clamp(&sampleR, -32767, 32767);
|
|
|
|
samples[currentSample] = sampleR;
|
|
|
|
int sampleL = s[1] + samples[currentSample + 1];
|
|
|
|
MathUtil::Clamp(&sampleL, -32767, 32767);
|
|
|
|
samples[currentSample + 1] = sampleL;
|
2011-03-12 22:02:46 +00:00
|
|
|
}
|
2013-10-29 05:23:17 +00:00
|
|
|
|
|
|
|
// Flush cached variable
|
2013-07-11 19:22:38 +00:00
|
|
|
Common::AtomicStore(m_indexR, indexR);
|
2009-12-23 15:34:14 +00:00
|
|
|
|
|
|
|
return numSamples;
|
|
|
|
}
|
|
|
|
|
2014-04-11 01:28:19 +00:00
|
|
|
unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider_framelimit)
|
|
|
|
{
|
|
|
|
if (!samples)
|
|
|
|
return 0;
|
2009-12-23 15:34:14 +00:00
|
|
|
|
2014-04-11 01:28:19 +00:00
|
|
|
std::lock_guard<std::mutex> lk(m_csMixing);
|
|
|
|
|
|
|
|
memset(samples, 0, num_samples * 2 * sizeof(short));
|
|
|
|
|
2014-07-07 03:30:06 +00:00
|
|
|
if (PowerPC::GetState() != PowerPC::CPU_RUNNING)
|
2014-04-11 01:28:19 +00:00
|
|
|
{
|
|
|
|
// Silence
|
|
|
|
return num_samples;
|
|
|
|
}
|
|
|
|
|
|
|
|
m_dma_mixer.Mix(samples, num_samples, consider_framelimit);
|
|
|
|
m_streaming_mixer.Mix(samples, num_samples, consider_framelimit);
|
|
|
|
if (m_logAudio)
|
|
|
|
g_wave_writer.AddStereoSamples(samples, num_samples);
|
|
|
|
return num_samples;
|
|
|
|
}
|
|
|
|
|
|
|
|
void CMixer::MixerFifo::PushSamples(const short *samples, unsigned int num_samples)
|
2009-12-23 15:34:14 +00:00
|
|
|
{
|
2013-07-11 19:22:38 +00:00
|
|
|
// 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 = Common::AtomicLoad(m_indexW);
|
2013-10-29 05:23:17 +00:00
|
|
|
|
2014-04-11 01:28:19 +00:00
|
|
|
if (m_mixer->m_throttle)
|
Hy, this is my first commit, and i hope it is not bad xD.
- First change is for Mixer.cpp, I've just re-added the functionality lost in r4724, so, if you disable audio throttle, games like donkey kong jungle beat, will work properly.
- Second change points to a doubt comment on UCode_Zelda_Voice.cpp, where it did not know here PB.NeedsReset came from. Well, the answer is it came from line 03b2 of the dumped Ucode, so when PB.IsBlanck equals to zero, PB.NeedsReset is zero too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6100 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-16 15:22:53 +00:00
|
|
|
{
|
|
|
|
// The auto throttle function. This loop will put a ceiling on the CPU MHz.
|
2013-07-11 19:22:38 +00:00
|
|
|
while (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
|
2009-12-23 15:34:14 +00:00
|
|
|
{
|
2014-07-07 03:30:06 +00:00
|
|
|
if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted())
|
2011-01-28 18:39:30 +00:00
|
|
|
break;
|
2009-12-25 11:59:04 +00:00
|
|
|
// Shortcut key for Throttle Skipping
|
2014-04-30 10:50:29 +00:00
|
|
|
if (Core::GetIsFramelimiterTempDisabled())
|
2011-01-30 16:40:38 +00:00
|
|
|
break;
|
2009-12-23 15:34:14 +00:00
|
|
|
SLEEP(1);
|
2009-12-25 11:59:04 +00:00
|
|
|
soundStream->Update();
|
2009-12-23 15:34:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if we have enough free space
|
2013-07-11 19:22:38 +00:00
|
|
|
// indexW == m_indexR results in empty buffer, so indexR must always be smaller than indexW
|
|
|
|
if (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
|
2009-12-23 15:34:14 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// AyuanX: Actual re-sampling work has been moved to sound thread
|
2009-12-25 11:59:04 +00:00
|
|
|
// to alleviate the workload on main thread
|
2009-12-23 15:34:14 +00:00
|
|
|
// and we simply store raw data here to make fast mem copy
|
2013-07-11 19:22:38 +00:00
|
|
|
int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (indexW & INDEX_MASK)) * sizeof(short);
|
2009-12-23 15:34:14 +00:00
|
|
|
if (over_bytes > 0)
|
|
|
|
{
|
2013-07-11 19:22:38 +00:00
|
|
|
memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
|
2009-12-23 15:34:14 +00:00
|
|
|
memcpy(&m_buffer[0], samples + (num_samples * 4 - over_bytes) / sizeof(short), over_bytes);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-07-11 19:22:38 +00:00
|
|
|
memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4);
|
2009-12-23 15:34:14 +00:00
|
|
|
}
|
2013-10-29 05:23:17 +00:00
|
|
|
|
2013-07-11 19:22:38 +00:00
|
|
|
Common::AtomicAdd(m_indexW, num_samples * 2);
|
2013-10-29 05:23:17 +00:00
|
|
|
|
2009-12-23 15:34:14 +00:00
|
|
|
return;
|
2008-12-08 05:25:12 +00:00
|
|
|
}
|
2009-12-20 02:23:26 +00:00
|
|
|
|
2014-04-11 01:28:19 +00:00
|
|
|
void CMixer::PushSamples(const short *samples, unsigned int num_samples)
|
|
|
|
{
|
|
|
|
m_dma_mixer.PushSamples(samples, num_samples);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples)
|
|
|
|
{
|
|
|
|
m_streaming_mixer.PushSamples(samples, num_samples);
|
|
|
|
}
|
2014-06-26 23:15:18 +00:00
|
|
|
|
|
|
|
void CMixer::SetStreamingVolume(unsigned int lvolume, unsigned int rvolume)
|
|
|
|
{
|
|
|
|
m_streaming_mixer.SetVolume(lvolume, rvolume);
|
|
|
|
}
|
|
|
|
|
|
|
|
void CMixer::MixerFifo::SetVolume(unsigned int lvolume, unsigned int rvolume)
|
|
|
|
{
|
|
|
|
m_LVolume = lvolume + (lvolume >> 7);
|
|
|
|
m_RVolume = rvolume + (rvolume >> 7);
|
|
|
|
}
|