libretro/RetroArch
1
0 Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2026-11-07 08:36:02 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

audio: reset the inline flush measurement where it is taken

Browse Source 
audio_driver_pause_fade() reset the fast-forward flush measurement on
the main thread. That is right where the measurement is taken there:
the threaded pipeline's producer and a callback core measure at the
frame end. Inline, the thread that submits measures, and a core may
submit from a thread of its own; the main thread's reset then wrote
last_flush_time beside that thread's read-modify-write of it, a 64-bit
store that can tear on 32-bit targets.

Inline, the reset now rides the pause and resume requests pause_fade
already posts, applied by the submitter under the inline claim before
its next flush measures. The main thread resets only for the threaded
pipeline and callback cores, and always without HAVE_THREADS.

The ff_speedup and discrete_multichannel pause lanes pass unchanged.
This commit is contained in:
LibretroAdmin authored and libretroadmin committed 2026-11-07 17:09:02 +01:00
1 parent 4635151a1d
commit 0e35c13878
1 file changed
+19 -4
Download Patch File Download Diff File Expand all files Collapse all files
audio/audio_driver.c
+19 -4
View File
@@ -6262,9 +6262,15 @@ static void audio_driver_requests_apply(audio_driver_state_t *audio_st,
{
case 0:
/* Without the threaded pipeline the ramp's arming is the
* submitter's, as is the rest of a pause and a resume. */
* submitter's, as is the rest of a pause and a resume -
* and the flush interval it measures, which the pause
* must not be read as. */
if (!audio_st->pipe_threaded)
{
audio_st->fade_in_pending = false;
if (!audio_st->callback.callback)
audio_driver_ff_mult_reset(audio_st);
}
audio_driver_pause_tail(audio_st, audio_st->current_audio,
write_tail);
break;
@@ -6274,6 +6280,8 @@ static void audio_driver_requests_apply(audio_driver_state_t *audio_st,
&audio_st->pipe_resume_topup) != 0;
if (!audio_st->pipe_threaded && topup)
audio_st->fade_in_pending = true;
if (!audio_st->pipe_threaded && !audio_st->callback.callback)
audio_driver_ff_mult_reset(audio_st);
audio_driver_resume_reset(audio_st, topup);
}
break;
@@ -6430,9 +6438,16 @@ void audio_driver_pause_fade(bool paused)
const audio_driver_t *audio = audio_st->current_audio;
bool was_silenced;
/* The paused interval is not a flush interval. Reset on the main
* thread, as the frame end resets it. */
audio_driver_ff_mult_reset(audio_st);
/* The paused interval is not a flush interval. The threaded
* pipeline's producer and a callback core measure at the frame end,
* on this thread, so reset here. Inline, the submitting thread
* measures, and a core may submit from a thread of its own: the
* pause and resume requests below reset it there, under the claim
* (see audio_driver_requests_apply()). */
#ifdef HAVE_THREADS
if (audio_st->pipe_threaded || audio_st->callback.callback)
#endif
audio_driver_ff_mult_reset(audio_st);
if ( !audio
|| !audio->write