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 /libavutil/float_dsp.h | |
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 'libavutil/float_dsp.h')
-rw-r--r-- | libavutil/float_dsp.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h index ff83bed..6cc7e76 100644 --- a/libavutil/float_dsp.h +++ b/libavutil/float_dsp.h @@ -146,9 +146,31 @@ typedef struct AVFloatDSPContext { * @param len length of vectors, multiple of 4 */ void (*butterflies_float)(float *restrict v1, float *restrict v2, int len); + + /** + * Calculate the scalar product of two vectors of floats. + * + * @param v1 first vector, 16-byte aligned + * @param v2 second vector, 16-byte aligned + * @param len length of vectors, multiple of 4 + * + * @return sum of elementwise products + */ + float (*scalarproduct_float)(const float *v1, const float *v2, int len); } AVFloatDSPContext; /** + * Return the scalar product of two vectors. + * + * @param v1 first input vector + * @param v2 first input vector + * @param len number of elements + * + * @return sum of elementwise products + */ +float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len); + +/** * Initialize a float DSP context. * * @param fdsp float DSP context |