summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2012-09-20 06:42:18 (GMT)
committerTanu Kaskinen <tanuk@iki.fi>2012-10-30 14:30:08 (GMT)
commit0da87df4ec0e568a54f4560814e31dfdec4c5b50 (patch)
treebc2cda9b26d0880c2ec7e0b8d0733ddc12577435
parent3adbb5ad034684ff751def0144764be8442fb15c (diff)
downloadpulseaudio-0da87df4ec0e568a54f4560814e31dfdec4c5b50.tar.gz
pulseaudio-0da87df4ec0e568a54f4560814e31dfdec4c5b50.tar.xz
combine: Keep the timer active in the null mode only when running.
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
-rw-r--r--src/modules/module-combine-sink.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/module-combine-sink.c b/src/modules/module-combine-sink.c
index dec2279..1afdc12 100644
--- a/src/modules/module-combine-sink.c
+++ b/src/modules/module-combine-sink.c
@@ -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) {
size_t ate = 0;
- pa_assert(u);
- /* If we are not running, we cannot produce any data */
- if (!pa_atomic_load(&u->thread_info.running))
- return;
+ pa_assert(u);
+ pa_assert(u->sink->thread_info.state == PA_SINK_RUNNING);
if (u->thread_info.in_null_mode)
u->thread_info.timestamp = now;
@@ -312,7 +310,7 @@ static void thread_func(void *userdata) {
pa_sink_process_rewind(u->sink, 0);
/* 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;
now = pa_rtclock_now();