Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge pull request #1230 from antonioginer/master

Browse Source 
Fix audio distortion with -refreshspeed and -sound xaudio2 (MT 06199)
This commit is contained in:
Vas Crabb 2016-08-12 03:48:57 +10:00 committed by GitHub
commit 5689fe16bf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/modules/sound/xaudio2_sound.cpp
View File

@ -45,6 +45,7 @@
#define INITIAL_BUFFER_COUNT 4 #define INITIAL_BUFFER_COUNT 4
#define SUBMIT_FREQUENCY_TARGET_MS 20 #define SUBMIT_FREQUENCY_TARGET_MS 20
#define RESAMPLE_TOLERANCE 1.20f
//============================================================ //============================================================
// Macros // Macros
@ -494,7 +495,7 @@ void sound_xaudio2::create_buffers(const WAVEFORMATEX &format)
// buffer size is equal to the bytes we need to hold in memory per X tenths of a second where X is audio_latency // buffer size is equal to the bytes we need to hold in memory per X tenths of a second where X is audio_latency
float audio_latency_in_seconds = m_audio_latency / 10.0f; float audio_latency_in_seconds = m_audio_latency / 10.0f;
UINT32 format_bytes_per_second = format.nSamplesPerSec * format.nBlockAlign; UINT32 format_bytes_per_second = format.nSamplesPerSec * format.nBlockAlign;
UINT32 total_buffer_size = format_bytes_per_second * audio_latency_in_seconds; UINT32 total_buffer_size = format_bytes_per_second * audio_latency_in_seconds * RESAMPLE_TOLERANCE;
// We want to be able to submit buffers every X milliseconds // We want to be able to submit buffers every X milliseconds
// I want to divide these up into "packets" so figure out how many buffers we need // I want to divide these up into "packets" so figure out how many buffers we need
@ -595,10 +596,6 @@ void sound_xaudio2::submit_needed()
XAUDIO2_VOICE_STATE state; XAUDIO2_VOICE_STATE state;
m_sourceVoice->GetState(&state, XAUDIO2_VOICE_NOSAMPLESPLAYED); m_sourceVoice->GetState(&state, XAUDIO2_VOICE_NOSAMPLESPLAYED);
// If we have a buffer on the queue, no reason to submit
if (state.BuffersQueued >= 1)
return;
std::lock_guard<std::mutex> lock(m_buffer_lock); std::lock_guard<std::mutex> lock(m_buffer_lock);
// Roll the buffer // Roll the buffer