X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Facelp_vectors.c;h=0c660acb5a6e31b46c23d3cd0a9efb60ca253944;hb=ea4d46e72945cba37feb7aa154eb970732f513e4;hp=b50c5f3ffe25db5945068d04151124800f53d336;hpb=dafcbfe44361b0d3caa22b15bc95e38ba80af7e6;p=ffmpeg diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c index b50c5f3ffe2..0c660acb5a6 100644 --- a/libavcodec/acelp_vectors.c +++ b/libavcodec/acelp_vectors.c @@ -23,8 +23,8 @@ #include #include "libavutil/common.h" +#include "libavutil/float_dsp.h" #include "avcodec.h" -#include "dsputil.h" #include "acelp_vectors.h" const uint8_t ff_fc_2pulses_9bits_track1[16] = @@ -94,10 +94,10 @@ const float ff_b60_sinc[61] = { 0.898529 , 0.865051 , 0.769257 , 0.624054 , 0.448639 , 0.265289 , 0.0959167 , -0.0412598 , -0.134338 , -0.178986 , -0.178528 , -0.142609 , -0.0849304 , -0.0205078 , 0.0369568 , 0.0773926 , 0.0955200 , 0.0912781 , - 0.0689392 , 0.0357056 , 0. , -0.0305481 , -0.0504150 , -0.0570068 , + 0.0689392 , 0.0357056 , 0.0 , -0.0305481 , -0.0504150 , -0.0570068 , -0.0508423 , -0.0350037 , -0.0141602 , 0.00665283, 0.0230713 , 0.0323486 , 0.0335388 , 0.0275879 , 0.0167847 , 0.00411987, -0.00747681, -0.0156860 , --0.0193481 , -0.0183716 , -0.0137634 , -0.00704956, 0. , 0.00582886 , +-0.0193481 , -0.0183716 , -0.0137634 , -0.00704956, 0.0 , 0.00582886 , 0.00939941, 0.0103760 , 0.00903320, 0.00604248, 0.00238037, -0.00109863 , -0.00366211, -0.00497437, -0.00503540, -0.00402832, -0.00241089, -0.000579834, 0.00103760, 0.00222778, 0.00277710, 0.00271606, 0.00213623, 0.00115967 , @@ -183,7 +183,7 @@ void ff_adaptive_gain_control(float *out, const float *in, float speech_energ, int size, float alpha, float *gain_mem) { int i; - float postfilter_energ = ff_scalarproduct_float_c(in, in, size); + float postfilter_energ = avpriv_scalarproduct_float_c(in, in, size); float gain_scale_factor = 1.0; float mem = *gain_mem; @@ -204,7 +204,7 @@ void ff_scale_vector_to_given_sum_of_squares(float *out, const float *in, float sum_of_squares, const int n) { int i; - float scalefactor = ff_scalarproduct_float_c(in, in, n); + float scalefactor = avpriv_scalarproduct_float_c(in, in, n); if (scalefactor) scalefactor = sqrt(sum_of_squares / scalefactor); for (i = 0; i < n; i++)