aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-09-04 14:45:48 +0200
committerAnton Khirnov <anton@khirnov.net>2016-09-22 09:47:52 +0200
commit683da86aabb4fbeddc3ead5fce737c63c0ee762c (patch)
tree40ca837d60567573ebf825e51806d5820b18c292 /libavcodec/arm
parentbf58545aace7d14522ce4fa680c7b3ff62109a3a (diff)
downloadffmpeg-683da86aabb4fbeddc3ead5fce737c63c0ee762c.tar.gz
audiodsp: reorder arguments for vector_clipf
This will make the x86 asm simpler. ARM conversion by Martin Storsjö <martin@martin.st> and Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/audiodsp_init_neon.c3
-rw-r--r--libavcodec/arm/audiodsp_neon.S5
2 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/arm/audiodsp_init_neon.c b/libavcodec/arm/audiodsp_init_neon.c
index af532724c8..08405cb829 100644
--- a/libavcodec/arm/audiodsp_init_neon.c
+++ b/libavcodec/arm/audiodsp_init_neon.c
@@ -25,8 +25,7 @@
#include "libavcodec/audiodsp.h"
#include "audiodsp_arm.h"
-void ff_vector_clipf_neon(float *dst, const float *src, float min, float max,
- int len);
+void ff_vector_clipf_neon(float *dst, const float *src, int len, float min, float max);
void ff_vector_clip_int32_neon(int32_t *dst, const int32_t *src, int32_t min,
int32_t max, unsigned int len);
diff --git a/libavcodec/arm/audiodsp_neon.S b/libavcodec/arm/audiodsp_neon.S
index dfb998de32..5871b82c2c 100644
--- a/libavcodec/arm/audiodsp_neon.S
+++ b/libavcodec/arm/audiodsp_neon.S
@@ -24,9 +24,8 @@
function ff_vector_clipf_neon, export=1
VFP vdup.32 q1, d0[1]
VFP vdup.32 q0, d0[0]
-NOVFP vdup.32 q0, r2
-NOVFP vdup.32 q1, r3
-NOVFP ldr r2, [sp]
+NOVFP vdup.32 q0, r3
+NOVFP vld1.32 {d2[],d3[]}, [sp]
vld1.f32 {q2},[r1,:128]!
vmin.f32 q10, q2, q1
vld1.f32 {q3},[r1,:128]!