empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio: Disable dynamic sample rate adjustment when recording wav/avi

Browse source
This commit is contained in:
Sour 2018-07-31 18:58:50 -04:00
parent ceda28fcbb
commit 7e905b89c5
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Core/SoundMixer.cpp
View file

@ -159,17 +159,17 @@ void SoundMixer::PlayAudioBuffer(uint32_t time)
}
if(rewindManager && rewindManager->SendAudio(_outputBuffer, (uint32_t)sampleCount, _sampleRate)) {
if(_waveRecorder) {
auto lock = _waveRecorderLock.AcquireSafe();
if(_waveRecorder) {
if(!_waveRecorder->WriteSamples(_outputBuffer, (uint32_t)sampleCount, _sampleRate, true)) {
bool isRecording = _waveRecorder || _console->GetVideoRenderer()->IsRecording();
if(isRecording) {
shared_ptr<WaveRecorder> recorder = _waveRecorder;
if(recorder) {
if(!recorder->WriteSamples(_outputBuffer, (uint32_t)sampleCount, _sampleRate, true)) {
_waveRecorder.reset();
}
}
_console->GetVideoRenderer()->AddRecordingSound(_outputBuffer, (uint32_t)sampleCount, _sampleRate);
}
_console->GetVideoRenderer()->AddRecordingSound(_outputBuffer, (uint32_t)sampleCount, _sampleRate);
if(_audioDevice && !_console->IsPaused()) {
_audioDevice->PlayBuffer(_outputBuffer, (uint32_t)sampleCount, _sampleRate, true);
}
@ -212,17 +212,7 @@ void SoundMixer::UpdateRates(bool forceUpdate)
}
}
AudioStatistics stats = GetStatistics();
int32_t requestedLatency = (int32_t)_settings->GetAudioLatency();
double targetRate = _sampleRate;
if(stats.AverageLatency > 0 && _settings->GetEmulationSpeed() == 100) {
if(stats.AverageLatency > requestedLatency + 2) {
targetRate *= 1.005;
} else if(stats.AverageLatency < requestedLatency - 2) {
targetRate *= 0.995;
}
}
double targetRate = _sampleRate * GetTargetRateAdjustment();
if(_clockRate != newRate || forceUpdate) {
_clockRate = newRate;
blip_set_rates(_blipBufLeft, _clockRate, targetRate);
@ -377,13 +367,11 @@ void SoundMixer::UpdateEqualizers(bool forceUpdate)
void SoundMixer::StartRecording(string filepath)
{
auto lock = _waveRecorderLock.AcquireSafe();
_waveRecorder.reset(new WaveRecorder(filepath, _settings->GetSampleRate(), true));
}
void SoundMixer::StopRecording()
{
auto lock = _waveRecorderLock.AcquireSafe();
_waveRecorder.reset();
}
@ -432,24 +420,34 @@ void SoundMixer::ProcessEndOfFrame()
}
}
void SoundMixer::UpdateTargetSampleRate()
double SoundMixer::GetTargetRateAdjustment()
{
AudioStatistics stats = GetStatistics();
if(stats.AverageLatency > 0 && _settings->GetEmulationSpeed() == 100) {
int32_t requestedLatency = (int32_t)_settings->GetAudioLatency();
double targetRate = _sampleRate;
bool isRecording = _waveRecorder || _console->GetVideoRenderer()->IsRecording();
if(!isRecording) {
//Don't deviate from selected sample rate while recording
//TODO: Have 2 output streams (one for recording, one for the speakers)
AudioStatistics stats = GetStatistics();
//Try to stay within +/- 2ms of requested latency
if(stats.AverageLatency > requestedLatency + 2) {
targetRate *= 0.995;
} else if(stats.AverageLatency < requestedLatency - 2) {
targetRate *= 1.005;
}
if(stats.AverageLatency > 0 && _settings->GetEmulationSpeed() == 100) {
int32_t requestedLatency = (int32_t)_settings->GetAudioLatency();
if(targetRate != _previousTargetRate) {
blip_set_rates(_blipBufLeft, _clockRate, targetRate);
blip_set_rates(_blipBufRight, _clockRate, targetRate);
_previousTargetRate = targetRate;
//Try to stay within +/- 2ms of requested latency
if(stats.AverageLatency > requestedLatency + 2) {
return 0.995;
} else if(stats.AverageLatency < requestedLatency - 2) {
return 1.005;
}
}
}
return 1.0;
}
void SoundMixer::UpdateTargetSampleRate()
{
double targetRate = _sampleRate * GetTargetRateAdjustment();
if(targetRate != _previousTargetRate) {
blip_set_rates(_blipBufLeft, _clockRate, targetRate);
blip_set_rates(_blipBufRight, _clockRate, targetRate);
_previousTargetRate = targetRate;
}
}

5
Core/SoundMixer.h
View file

@ -33,8 +33,7 @@ private:
IAudioDevice* _audioDevice;
EmulationSettings* _settings;
unique_ptr<WaveRecorder> _waveRecorder;
SimpleLock _waveRecorderLock;
shared_ptr<WaveRecorder> _waveRecorder;
double _fadeRatio;
uint32_t _muteFrameCount;
unique_ptr<OggMixer> _oggMixer;
@ -79,6 +78,8 @@ private:
void UpdateEqualizers(bool forceUpdate);
void ApplyEqualizer(orfanidis_eq::eq1* equalizer, size_t sampleCount);
double GetTargetRateAdjustment();
void UpdateTargetSampleRate();
protected: