Re: [pulseaudio-discuss] [PATCH] virtual-surround: check if resampled memblock is not equal to input

2012-11-24 Thread Tanu Kaskinen
On Sat, 2012-11-24 at 12:32 +0100, Niels Ole Salscheider wrote:
> 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.

Thanks, applied to my "next" branch.

-- 
Tanu

___
pulseaudio-discuss mailing list
pulseaudio-discuss@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss


[pulseaudio-discuss] [PATCH] virtual-surround: check if resampled memblock is not equal to input

2012-11-24 Thread Niels Ole Salscheider
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 4915278..adaa58f 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 */
-- 
1.8.0

___
pulseaudio-discuss mailing list
pulseaudio-discuss@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss