From 3b7504495fa58d5812a5ef16f25f3af653aac66f Mon Sep 17 00:00:00 2001
From: Peter Meerwald
Date: Wed, 16 Apr 2014 18:20:16 +0200
Subject: [PATCH] sconv: Cleanup ARM NEON code
Fix compiler warning, code formatting
Signed-off-by: Peter Meerwald
---
src/pulsecore/sconv_neon.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/pulsecore/sconv_neon.c b/src/pulsecore/sconv_neon.c
index 071ba855..6c2a2b3a 100644
--- a/src/pulsecore/sconv_neon.c
+++ b/src/pulsecore/sconv_neon.c
@@ -18,8 +18,6 @@
#include
#endif
-#include
-
#include
#include
@@ -60,9 +58,10 @@ static void pa_sconv_s16le_from_f32ne_neon(unsigned n, const float *src, int16_t
static void pa_sconv_s16le_to_f32ne_neon(unsigned n, const int16_t *src, float *dst) {
unsigned i = n & 3;
+ const float invscale = 1.0f / (1 << 15);
__asm__ __volatile__ (
- "movs %[n], %[n], lsr #2 \n\t"
+ "movs %[n], %[n], lsr #2 \n\t"
"beq 2f \n\t"
"1: \n\t"
@@ -81,7 +80,6 @@ static void pa_sconv_s16le_to_f32ne_neon(unsigned n, const int16_t *src, float *
);
/* leftovers */
- const float invscale = 1.0f / (1 << 15);
while (i--) {
*dst++ = *src++ * invscale;
}
--
2.39.2