sink-input: fix to add ducking silence block with correct sample spec

[Version] 11.1-80
[Issue Type] Bug fix

Change-Id: I2dc445abdd121178d4890089b0a63520dba6f271
(cherry picked from commit 7f722b407c1d8c81118ae25e5e3f24cbefa1c496)

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 70e5a2d..708a5b0 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          11.1
-Release:          79
+Release:          80
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index b1a625a..f0bcf4f 100644 (file)
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1031,13 +1031,12 @@ static void check_and_apply_silence(pa_sink_input *i) {
 
     if (i->thread_info.silenced && i->thread_info.silence_duration > 0) {
         pa_memchunk schunk;
-        size_t target_length;
+        size_t target_length = pa_usec_to_bytes(i->thread_info.silence_duration, &i->sink->sample_spec);
 
-        target_length = pa_usec_to_bytes(i->thread_info.silence_duration, &i->sample_spec);
         pa_silence_memchunk_get(&i->core->silence_cache,
                                 i->core->mempool,
                                 &schunk,
-                                &i->sample_spec,
+                                &i->sink->sample_spec,
                                 i->thread_info.resampler ? pa_resampler_max_block_size(i->thread_info.resampler) : 0);
 
         while (target_length > 0) {