From 523af5b30220df76515b8b9fa62d0f80bffc541f Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider Date: Sat, 24 Nov 2012 12:32:51 +0100 Subject: [PATCH] virtual-surround: check if resampled memblock is not equal to input Since commit e32a408b3cdd46857fdf12210c1bf5bdbf3a96f8, we silence the input memblock in order to give the resampler enough input samples, if necessary. But if there is no need to resample the hrir, the resampled memblock is actually the same as the input memblock. Thus, we have to make sure that we do not silence it in this case. --- src/modules/module-virtual-surround-sink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/module-virtual-surround-sink.c b/src/modules/module-virtual-surround-sink.c index 491527830..adaa58f69 100644 --- a/src/modules/module-virtual-surround-sink.c +++ b/src/modules/module-virtual-surround-sink.c @@ -738,8 +738,10 @@ int pa__init(pa_module*m) { /* add silence to the hrir until we get enough samples out of the resampler */ while (hrir_copied_length < hrir_total_length) { pa_resampler_run(resampler, &hrir_temp_chunk, &hrir_temp_chunk_resampled); - /* Silence input block */ - pa_silence_memblock(hrir_temp_chunk.memblock, &hrir_temp_ss); + if (hrir_temp_chunk.memblock != hrir_temp_chunk_resampled.memblock) { + /* Silence input block */ + pa_silence_memblock(hrir_temp_chunk.memblock, &hrir_temp_ss); + } if (hrir_temp_chunk_resampled.memblock) { /* Copy hrir data */