ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

controll the interpolation frac by the fifo size

This commit is contained in:
degasus 2014-02-06 13:03:40 +01:00
parent d20dbbc92f
commit ca9fd64df9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/AudioCommon/Mixer.cpp
View File

@ -44,12 +44,18 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
u32 indexR = Common::AtomicLoad(m_indexR);
u32 indexW = Common::AtomicLoad(m_indexW);
float numLeft = ((indexW - indexR) & INDEX_MASK) / 2;
m_numLeftI = (numLeft + m_numLeftI*(CONTROL_AVG-1)) / CONTROL_AVG;
float offset = (m_numLeftI - LOW_WATERMARK) * 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
static u32 frac = 0;
const u32 ratio = (u32)( 65536.0f * (float)AudioInterface::GetAIDSampleRate() / (float)m_sampleRate );
const u32 ratio = (u32)( 65536.0f * (float)AudioInterface::GetAIDSampleRate() / (float)m_sampleRate + offset );
if(ratio > 0x10000)
ERROR_LOG(AUDIO, "ratio out of range");

10
Source/Core/AudioCommon/Mixer.h
View File

@ -8,9 +8,13 @@
#include "StdMutex.h"
// 16 bit Stereo
#define MAX_SAMPLES (1024 * 8)
#define MAX_SAMPLES (1024 * 2) // 64ms
#define INDEX_MASK (MAX_SAMPLES * 2 - 1)
#define RESERVED_SAMPLES (256)
#define LOW_WATERMARK 1280 // 40 ms
#define MAX_FREQ_SHIFT 0x0100 // of 0x10000
#define CONTROL_FACTOR 0.3 // in freq_shift per fifo size offset
#define CONTROL_AVG 32
class CMixer {
@ -24,6 +28,7 @@ public:
, m_logAudio(0)
, m_indexW(0)
, m_indexR(0)
, m_numLeftI(0.0f)
{
// AyuanX: The internal (Core & DSP) sample rate is fixed at 32KHz
// So when AI/DAC sample rate differs than 32KHz, we have to do re-sampling
@ -97,6 +102,7 @@ protected:
volatile u32 m_indexR;
std::mutex m_csMixing;
float m_numLeftI;
volatile float m_speed; // Current rate of the emulation (1.0 = 100% speed)
private: