X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcelp_math.h;h=9cebdfe695c48412a241ce8c40db3e41834e5865;hb=e807491fc6a336e4becc0cbc981274a8fde18aba;hp=ce0726fba114efbc6ea4336b16bc0ac8f3219edf;hpb=0bc484ad51f5c85a3c1298a718355724905cdd6b;p=ffmpeg

diff --git a/libavcodec/celp_math.h b/libavcodec/celp_math.h
index ce0726fba11..9cebdfe695c 100644
--- a/libavcodec/celp_math.h
+++ b/libavcodec/celp_math.h
@@ -3,20 +3,20 @@
  *
  * Copyright (c) 2008 Vladimir Voroshilov
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,14 +25,6 @@
 
 #include <stdint.h>
 
-/**
- * fixed-point implementation of cosine in [0; PI) domain.
- * @param arg fixed-point cosine argument, 0 <= arg < 0x4000
- *
- * @return value of (1<<15) * cos(arg * PI / (1<<14)), -0x8000 <= result <= 0x7fff
- */
-int16_t ff_cos(uint16_t arg);
-
 /**
  * fixed-point implementation of exp2(x) in [0; 1] domain.
  * @param power argument to exp2, 0 <= power <= 0x7fff
@@ -43,32 +35,22 @@ int16_t ff_cos(uint16_t arg);
 int ff_exp2(uint16_t power);
 
 /**
- * Calculates log2(x).
+ * Calculate log2(x).
  * @param value function argument, 0 < value <= 7fff ffff
  *
  * @return value of (1<<15) * log2(value)
  */
-int ff_log2(uint32_t value);
+int ff_log2_q15(uint32_t value);
 
 /**
- * returns the dot product.
+ * Calculate the dot product of 2 int16_t vectors.
  * @param a input data array
  * @param b input data array
  * @param length number of elements
- * @param shift right shift by this value will be done after multiplication
  *
  * @return dot product = sum of elementwise products
  */
-static int dot_product(const int16_t* a, const int16_t* b, int length, int shift)
-{
-    int sum = 0;
-    int i;
-
-    for(i=0; i<length; i++)
-        sum += (a[i] * b[i]) >> shift;
-
-    return sum;
-}
+int64_t ff_dot_product(const int16_t *a, const int16_t *b, int length);
 
 /**
  * Shift value left or right depending on sign of offset parameter.
@@ -83,14 +65,4 @@ static inline int bidir_sal(int value, int offset)
     else           return value <<  offset;
 }
 
-/**
- * returns the dot product.
- * @param a input data array
- * @param b input data array
- * @param length number of elements
- *
- * @return dot product = sum of elementwise products
- */
-extern float ff_dot_productf(const float* a, const float* b, int length);
-
 #endif /* AVCODEC_CELP_MATH_H */