mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

combine: Keep the timer active in the null mode only when running.

Browse source 
Previously thread_func() used PA_SINK_IS_OPENED() to check whether
some data should be rendered. process_render_null() used a different
check: it would return immediately if the sink was not in the RUNNING
state. This caused a busy loop when the sink was in the IDLE state,
because process_render_null() didn't update the timestamp, and
thread_func() still kept the timer active using the old timestamp.
pa_rtpoll_run() would return immediately because of the old timestamp.

This is fixed by using the same check in both thread_func() and
process_render_null(). Since the checks are the same, it's actually
redundant to have the check in process_render_null(), so it is now an
assertion.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=54779
This commit is contained in:
Tanu Kaskinen 2012-09-20 09:42:18 +03:00
parent 3adbb5ad03
commit 0da87df4ec
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-combine-sink.c
View file

@ -257,11 +257,9 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
static void process_render_null(struct userdata *u, pa_usec_t now) { static void process_render_null(struct userdata *u, pa_usec_t now) {
size_t ate = 0; size_t ate = 0;
pa_assert(u);
/* If we are not running, we cannot produce any data */ pa_assert(u);
if (!pa_atomic_load(&u->thread_info.running)) pa_assert(u->sink->thread_info.state == PA_SINK_RUNNING);
return;
if (u->thread_info.in_null_mode) if (u->thread_info.in_null_mode)
u->thread_info.timestamp = now; u->thread_info.timestamp = now;
@ -312,7 +310,7 @@ static void thread_func(void *userdata) {
pa_sink_process_rewind(u->sink, 0); pa_sink_process_rewind(u->sink, 0);
/* If no outputs are connected, render some data and drop it immediately. */ /* If no outputs are connected, render some data and drop it immediately. */
if (PA_SINK_IS_OPENED(u->sink->thread_info.state) && !u->thread_info.active_outputs) { if (u->sink->thread_info.state == PA_SINK_RUNNING && !u->thread_info.active_outputs) {
pa_usec_t now; pa_usec_t now;
now = pa_rtclock_now(); now = pa_rtclock_now();