diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-20 15:41:52 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-22 11:55:42 -0800 |
| commit | d56668bd80075615b89aff652fe8a576bf853ceb (patch) | |
| tree | 9da3ed036b716dbaf33f5c9869578bedb6e393a2 /libavcodec/sipr16k.c | |
| parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
| download | ffmpeg-streaming-d56668bd80075615b89aff652fe8a576bf853ceb.zip ffmpeg-streaming-d56668bd80075615b89aff652fe8a576bf853ceb.tar.gz | |
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
This makes the aac decoder and all voice codecs independent of dsputil.
Diffstat (limited to 'libavcodec/sipr16k.c')
| -rw-r--r-- | libavcodec/sipr16k.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c index bff739e..a472dfd 100644 --- a/libavcodec/sipr16k.c +++ b/libavcodec/sipr16k.c @@ -25,8 +25,8 @@ #include "sipr.h" #include "libavutil/common.h" +#include "libavutil/float_dsp.h" #include "libavutil/mathematics.h" -#include "dsputil.h" #include "lsp.h" #include "celp_filters.h" #include "acelp_vectors.h" @@ -163,11 +163,11 @@ static float acelp_decode_gain_codef(float gain_corr_factor, const float *fc_v, const float *ma_prediction_coeff, int subframe_size, int ma_pred_order) { - mr_energy += - ff_scalarproduct_float_c(quant_energy, ma_prediction_coeff, ma_pred_order); + mr_energy += avpriv_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_scalarproduct_float_c(fc_v, fc_v, subframe_size))); + sqrt((0.01 + avpriv_scalarproduct_float_c(fc_v, fc_v, subframe_size))); return mr_energy; } |
