[FFmpeg-soc] [soc]: r4817 - in amr: amr-ffmpeg.diff amrnbfloatdec.c

[cmcq]

Author: cmcq
Date: Tue Jul 28 17:59:26 2009
New Revision: 4817

Log:
ff_weighted_vector_sumf has been moved to acelp_vectors.c

Modified:
   amr/amr-ffmpeg.diff
   amr/amrnbfloatdec.c

Modified: amr/amr-ffmpeg.diff
==============================================================================
--- amr/amr-ffmpeg.diff	Tue Jul 28 17:52:32 2009	(r4816)
+++ amr/amr-ffmpeg.diff	Tue Jul 28 17:59:26 2009	(r4817)
@@ -6,7 +6,7 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o
  OBJS-$(CONFIG_ALAC_DECODER)            += alac.o
  OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o
-+OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o
++OBJS-$(CONFIG_AMRNB_DECODER)           += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o
  OBJS-$(CONFIG_AMV_DECODER)             += sp5xdec.o mjpegdec.o mjpeg.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o
  OBJS-$(CONFIG_ASV1_DECODER)            += asv1.o mpeg12data.o

Modified: amr/amrnbfloatdec.c
==============================================================================
--- amr/amrnbfloatdec.c	Tue Jul 28 17:52:32 2009	(r4816)
+++ amr/amrnbfloatdec.c	Tue Jul 28 17:59:26 2009	(r4817)
@@ -38,6 +38,7 @@
 #include "celp_math.h"
 #include "celp_filters.h"
 #include "acelp_filters.h"
+#include "acelp_vectors.h"
 #include "amrnbfloatdata.h"
 
 void ff_celp_lspf2lpc(const double *lspf, float *lpc);
@@ -92,31 +93,6 @@ typedef struct AMRContext {
  * @note this function should be moved to acelp_vectors.[ch]
  *       and used in qcelpdec.c
  *
- * weighted sum of two vectors with rounding.
- * @param out [out] result of addition
- * @param in_a first vector
- * @param in_b second vector
- * @param weight_coeff_a first vector weight coefficient
- * @param weight_coeff_b second vector weight coefficient
- * @param length vectors length
- *
- * @note It is safe to pass the same buffer for out and in_a or in_b.
- */
-void ff_weighted_vector_sumf(float *out, const float *in_a, const float *in_b,
-                             float weight_coeff_a, float weight_coeff_b,
-                             int length)
-{
-    int i;
-
-    for (i = 0; i < length; i++)
-        out[i] = weight_coeff_a * in_a[i]
-               + weight_coeff_b * in_b[i];
-}
-
-/**
- * @note this function should be moved to acelp_vectors.[ch]
- *       and used in qcelpdec.c
- *
  * Apply adaptive gain control by gain scaling.
  *
  * @param v_out output vector