diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
| commit | 416d2f7a1244e7e93e291786ac98313153f87db5 (patch) | |
| tree | 231d0d704cda257e4bc2a210df6b2fe553f407c6 /libavcodec/sipr16k.c | |
| parent | fb6fb0dedbc103ba9cd4e7d63edee15317143b21 (diff) | |
| parent | 7627c35a81241c98768d2d1f13d576591cac0b1c (diff) | |
| download | android_external_ffmpeg-416d2f7a1244e7e93e291786ac98313153f87db5.tar.gz android_external_ffmpeg-416d2f7a1244e7e93e291786ac98313153f87db5.tar.bz2 android_external_ffmpeg-416d2f7a1244e7e93e291786ac98313153f87db5.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: export some functions
configure: use HOSTCC_C/O in check_host_cc
configure: use AS_O setting in check_as
configure: use LD_O setting in check_ld()
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
build: Restore dependency of acelp_filters.o on celp_math.o
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
celp_math: Move ff_cos() to the only place it is used
build: Use portable abstraction for linker/hostcc output file syntax
configure: Fix shared library creation for OpenBSD
vp56: Don't use DECLARE_ALIGN on a typedef name
mss1: move code that will be reused by MSS2 decoder into separate file
mss1: merge decode_intra() and decode_inter()
avprobe: Get rid of ugly casts in the options table
vf_hqdn3d: Remove a duplicate inline declaration
Conflicts:
Makefile
configure
ffprobe.c
libavcodec/Makefile
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/dsputil.c
libavcodec/lsp.c
libavcodec/mss1.c
libavcodec/ra288.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
| -rw-r--r-- | libavcodec/sipr16k.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c index 96079d93b5..c2e090bb0a 100644 --- a/libavcodec/sipr16k.c +++ b/libavcodec/sipr16k.c @@ -26,8 +26,9 @@ #include "sipr.h" #include "libavutil/common.h" #include "libavutil/mathematics.h" +#include "dsputil.h" #include "lsp.h" -#include "celp_math.h" +#include "celp_filters.h" #include "acelp_vectors.h" #include "acelp_pitch_delay.h" #include "acelp_filters.h" @@ -163,10 +164,10 @@ static float acelp_decode_gain_codef(float gain_corr_factor, const float *fc_v, int subframe_size, int ma_pred_order) { mr_energy += - ff_dot_productf(quant_energy, ma_prediction_coeff, ma_pred_order); + ff_scalarproduct_float_c(quant_energy, ma_prediction_coeff, ma_pred_order); mr_energy = gain_corr_factor * exp(M_LN10 / 20. * mr_energy) / - sqrt((0.01 + ff_dot_productf(fc_v, fc_v, subframe_size))); + sqrt((0.01 + ff_scalarproduct_float_c(fc_v, fc_v, subframe_size))); return mr_energy; } |