src/pulsecore/sconv_neon.c | 6 ++---- src/utils/pacat.c | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-)
New commits: commit f975aad1d3563821f255d116a4c7b4005d7f2a02 Author: Peter Meerwald <[email protected]> Date: Wed Apr 16 18:12:52 2014 +0200 pacat: Mention source in addition to sink where applicable in help Signed-off-by: Peter Meerwald <[email protected]> diff --git a/src/utils/pacat.c b/src/utils/pacat.c index a3f3aa9..e60dfca 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -687,12 +687,12 @@ static void help(const char *argv0) { " --channels=CHANNELS The number of channels, 1 for mono, 2 for stereo\n" " (defaults to 2)\n" " --channel-map=CHANNELMAP Channel map to use instead of the default\n" - " --fix-format Take the sample format from the sink the stream is\n" + " --fix-format Take the sample format from the sink/source the stream is\n" " being connected to.\n" - " --fix-rate Take the sampling rate from the sink the stream is\n" + " --fix-rate Take the sampling rate from the sink/source the stream is\n" " being connected to.\n" " --fix-channels Take the number of channels and the channel map\n" - " from the sink the stream is being connected to.\n" + " from the sink/source the stream is being connected to.\n" " --no-remix Don't upmix or downmix channels.\n" " --no-remap Map channels by index instead of name.\n" " --latency=BYTES Request the specified latency in bytes.\n" @@ -701,7 +701,7 @@ static void help(const char *argv0) { " --process-time-msec=MSEC Request the specified process time per request in msec.\n" " --property=PROPERTY=VALUE Set the specified property to the specified value.\n" " --raw Record/play raw PCM data.\n" - " --passthrough passthrough data \n" + " --passthrough Passthrough data.\n" " --file-format[=FFORMAT] Record/play formatted PCM data.\n" " --list-file-formats List available file formats.\n" " --monitor-stream=INDEX Record from the sink input with index INDEX.\n") commit 3b7504495fa58d5812a5ef16f25f3af653aac66f Author: Peter Meerwald <[email protected]> Date: Wed Apr 16 18:20:16 2014 +0200 sconv: Cleanup ARM NEON code Fix compiler warning, code formatting Signed-off-by: Peter Meerwald <[email protected]> diff --git a/src/pulsecore/sconv_neon.c b/src/pulsecore/sconv_neon.c index 071ba85..6c2a2b3 100644 --- a/src/pulsecore/sconv_neon.c +++ b/src/pulsecore/sconv_neon.c @@ -18,8 +18,6 @@ #include <config.h> #endif -#include <pulse/rtclock.h> - #include <pulsecore/macro.h> #include <pulsecore/endianmacros.h> @@ -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; } _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
