summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/svolume_arm.c
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2010-10-08 18:47:00 +0200
committerColin Guthrie <cguthrie@mandriva.org>2010-10-13 14:52:03 +0100
commit4d84a00b495c44a9e348534bf754ace823c9abe8 (patch)
treeaa84e0c55c9e2959e11ead3ec158943399c7f468 /src/pulsecore/svolume_arm.c
parent489f50e2f4160f1368df38657bb91e77fd52c861 (diff)
SSE/MMX/ARM: Fix high frequency noise with unusual number of channels
In the assembly optimized versions of SSE, a noise could occur when the number of channels were 3,5,6 or 7. For MMX and ARM, this could occur when the number of channels were 3. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Diffstat (limited to 'src/pulsecore/svolume_arm.c')
-rw-r--r--src/pulsecore/svolume_arm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
index 5bd1448f..fdd8f09a 100644
--- a/src/pulsecore/svolume_arm.c
+++ b/src/pulsecore/svolume_arm.c
@@ -47,7 +47,10 @@ pa_volume_s16ne_arm (int16_t *samples, int32_t *volumes, unsigned channels, unsi
{
int32_t *ve;
- channels = PA_MAX (4U, channels);
+ /* Channels must be at least 4, and always a multiple of the original number.
+ * This is also the max amount we overread the volume array, which should
+ * have enough padding. */
+ channels = channels == 3 ? 6 : PA_MAX (4U, channels);
ve = volumes + channels;
__asm__ __volatile__ (