From 651402ef235a6d7ff830cb6269a3f79c87cb3011 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Tue, 8 Dec 2020 11:20:14 +0900 Subject: [PATCH] null-source: Fix max_latency_msec argument is not changed This module uses 2 seconds for default max latency. If max_latency_msec is set, max_latency value will be changed. Part-of: [jcsing.lee: backport mainline commit a17d00c3d for null-source latency] [Version] 13.0-26 [Issue Type] Bug fix Change-Id: I71d3d0795c51b3edc265f852199b74ab9afae10c --- packaging/pulseaudio.spec | 2 +- src/modules/module-null-source.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec index c318db2..a0851ca 100644 --- a/packaging/pulseaudio.spec +++ b/packaging/pulseaudio.spec @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 13.0 -Release: 25 +Release: 26 Group: Multimedia/Audio License: LGPL-2.1 URL: http://pulseaudio.org diff --git a/src/modules/module-null-source.c b/src/modules/module-null-source.c index 38e3c82..3aefbf2 100644 --- a/src/modules/module-null-source.c +++ b/src/modules/module-null-source.c @@ -200,7 +200,6 @@ int pa__init(pa_module*m) { pa_channel_map map; pa_modargs *ma = NULL; pa_source_new_data data; - pa_usec_t max_latency = MAX_LATENCY_USEC; uint32_t max_latency_msec; pa_assert(m); @@ -252,10 +251,13 @@ int pa__init(pa_module*m) { pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_rtpoll(u->source, u->rtpoll); - if (pa_modargs_get_value_u32(ma, "max_latency_msec", &max_latency_msec)) - max_latency = max_latency_msec * PA_USEC_PER_MSEC; + max_latency_msec = MAX_LATENCY_USEC / PA_USEC_PER_MSEC; + if (pa_modargs_get_value_u32(ma, "max_latency_msec", &max_latency_msec) < 0) { + pa_log("Failed to get max_latency_msec."); + goto fail; + } - pa_source_set_latency_range(u->source, MIN_LATENCY_USEC, max_latency); + pa_source_set_latency_range(u->source, MIN_LATENCY_USEC, max_latency_msec * PA_USEC_PER_MSEC); u->block_usec = u->source->thread_info.max_latency; -- 2.7.4