diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:31:55 +0100 |
commit | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (patch) | |
tree | f623e5063c24e6c4afc50338dfeecf7054c673a2 /libavcodec/arm | |
parent | 24604ebaf85b5436d10da811f455dd710b353aca (diff) | |
parent | 73b704ac609d83e0be124589f24efd9b94947cf9 (diff) | |
download | ffmpeg-streaming-8102f27b5b3dff54f8099019c2df4701ac5e5d4f.zip ffmpeg-streaming-8102f27b5b3dff54f8099019c2df4701ac5e5d4f.tar.gz |
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
arm: Add some missing header #includes
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/dsputil_init_neon.c | 3 | ||||
-rw-r--r-- | libavcodec/arm/dsputil_neon.S | 13 | ||||
-rw-r--r-- | libavcodec/arm/h264pred_init_arm.c | 1 | ||||
-rw-r--r-- | libavcodec/arm/vp3dsp_init_arm.c | 1 | ||||
-rw-r--r-- | libavcodec/arm/vp8dsp_init_arm.c | 1 | ||||
-rw-r--r-- | libavcodec/arm/vp8dsp_init_armv6.c | 2 | ||||
-rw-r--r-- | libavcodec/arm/vp8dsp_init_neon.c | 2 |
7 files changed, 7 insertions, 16 deletions
diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index c67bbed..09248cc 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -142,8 +142,6 @@ void ff_avg_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_h264_chroma_mc2_neon(uint8_t *, uint8_t *, int, int, int, int); -float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len); - void ff_vector_clipf_neon(float *dst, const float *src, float min, float max, int len); void ff_vector_clip_int32_neon(int32_t *dst, const int32_t *src, int32_t min, @@ -293,7 +291,6 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) c->avg_h264_qpel_pixels_tab[1][15] = ff_avg_h264_qpel8_mc33_neon; } - c->scalarproduct_float = ff_scalarproduct_float_neon; c->vector_clipf = ff_vector_clipf_neon; c->vector_clip_int32 = ff_vector_clip_int32_neon; diff --git a/libavcodec/arm/dsputil_neon.S b/libavcodec/arm/dsputil_neon.S index 31ad72f..5e15d6f 100644 --- a/libavcodec/arm/dsputil_neon.S +++ b/libavcodec/arm/dsputil_neon.S @@ -531,19 +531,6 @@ function ff_add_pixels_clamped_neon, export=1 bx lr endfunc -function ff_scalarproduct_float_neon, export=1 - vmov.f32 q2, #0.0 -1: vld1.32 {q0},[r0,:128]! - vld1.32 {q1},[r1,:128]! - vmla.f32 q2, q0, q1 - subs r2, r2, #4 - bgt 1b - vadd.f32 d0, d4, d5 - vpadd.f32 d0, d0, d0 -NOVFP vmov.32 r0, d0[0] - bx lr -endfunc - function ff_vector_clipf_neon, export=1 VFP vdup.32 q1, d0[1] VFP vdup.32 q0, d0[0] diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index 31714d7..20c1fde 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -21,6 +21,7 @@ #include <stdint.h> #include "libavutil/arm/cpu.h" +#include "libavcodec/avcodec.h" #include "libavcodec/h264pred.h" void ff_pred16x16_vert_neon(uint8_t *src, ptrdiff_t stride); diff --git a/libavcodec/arm/vp3dsp_init_arm.c b/libavcodec/arm/vp3dsp_init_arm.c index 90fc34b..4ce75fe 100644 --- a/libavcodec/arm/vp3dsp_init_arm.c +++ b/libavcodec/arm/vp3dsp_init_arm.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/arm/cpu.h" +#include "libavcodec/dsputil.h" #include "libavcodec/vp3dsp.h" void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, DCTELEM *data); diff --git a/libavcodec/arm/vp8dsp_init_arm.c b/libavcodec/arm/vp8dsp_init_arm.c index 5c84ed3..d360ae3 100644 --- a/libavcodec/arm/vp8dsp_init_arm.c +++ b/libavcodec/arm/vp8dsp_init_arm.c @@ -18,6 +18,7 @@ #include <stdint.h> +#include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" #include "libavcodec/vp8dsp.h" #include "vp8dsp.h" diff --git a/libavcodec/arm/vp8dsp_init_armv6.c b/libavcodec/arm/vp8dsp_init_armv6.c index 85a803a..c3d024f 100644 --- a/libavcodec/arm/vp8dsp_init_armv6.c +++ b/libavcodec/arm/vp8dsp_init_armv6.c @@ -17,6 +17,8 @@ */ #include <stdint.h> + +#include "libavutil/attributes.h" #include "libavcodec/vp8dsp.h" #include "vp8dsp.h" diff --git a/libavcodec/arm/vp8dsp_init_neon.c b/libavcodec/arm/vp8dsp_init_neon.c index dbe5b9f..965243c 100644 --- a/libavcodec/arm/vp8dsp_init_neon.c +++ b/libavcodec/arm/vp8dsp_init_neon.c @@ -17,6 +17,8 @@ */ #include <stdint.h> + +#include "libavutil/attributes.h" #include "libavcodec/vp8dsp.h" #include "vp8dsp.h" |