videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

pulse: earlier return in stream_drain 

This specific case will be gone on the next commit.
No functional changes.
This commit is contained in:
Thomas Guillem 2023-11-13 16:42:03 +01:00 committed by Steve Lhomme
parent ee4a520cff
commit 25c17ac83d
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/audio_output/pulse.c
View File

@ -427,23 +427,24 @@ static void stream_drain(pa_stream *s, audio_output_t *aout)
pa_operation_unref(op);
if (sys->last_date == VLC_TICK_INVALID)
aout_DrainedReport(aout);
else
{
sys->last_date = VLC_TICK_INVALID;
sys->flush_rt = 0;
/* XXX: Loosy drain emulation.
* See #18141: drain callback is never received */
sys->draining = true;
assert(sys->drain_trigger == NULL);
vlc_tick_t delay =
stream_get_interpolated_latency(s, aout, vlc_tick_now());
delay += pa_rtclock_now();
sys->drain_trigger = pa_context_rttime_new(sys->context, delay,
drain_trigger_cb, aout);
aout_DrainedReport(aout);
return;
}
sys->last_date = VLC_TICK_INVALID;
sys->flush_rt = 0;
/* XXX: Loosy drain emulation.
* See #18141: drain callback is never received */
sys->draining = true;
assert(sys->drain_trigger == NULL);
vlc_tick_t delay =
stream_get_interpolated_latency(s, aout, vlc_tick_now());
delay += pa_rtclock_now();
sys->drain_trigger = pa_context_rttime_new(sys->context, delay,
drain_trigger_cb, aout);
}
static void data_free(void *data)