Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '73b704ac60'

Browse source 
* commit '73b704ac60':
  arm: Add some missing header #includes
  floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

Conflicts:
	libavcodec/acelp_pitch_delay.c
	libavcodec/amrnbdec.c
	libavcodec/amrwbdec.c
	libavcodec/ra288.c
	libavcodec/x86/dsputil_mmx.c
	libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-23 14:31:55 +01:00
commit 8102f27b5b
28 changed files with 141 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libavcodec/qcelpdec.c
View file

@ -30,10 +30,10 @@
#include <stddef.h>
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "internal.h"
#include "get_bits.h"
#include "dsputil.h"
#include "qcelpdata.h"
#include "celp_filters.h"
#include "acelp_filters.h"
@ -400,12 +400,10 @@ static void apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in)
{
int i;
for (i = 0; i < 160; i += 40)
ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i,
ff_scalarproduct_float_c(v_ref + i,
v_ref + i,
40),
40);
for (i = 0; i < 160; i += 40) {
float res = avpriv_scalarproduct_float_c(v_ref + i, v_ref + i, 40);
ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i, res, 40);
}
}
/**
@ -680,8 +678,9 @@ static void postfilter(QCELPContext *q, float *samples, float *lpc)
ff_tilt_compensation(&q->postfilter_tilt_mem, 0.3, pole_out + 10, 160);
ff_adaptive_gain_control(samples, pole_out + 10,
ff_scalarproduct_float_c(q->formant_mem + 10,
q->formant_mem + 10, 160),
avpriv_scalarproduct_float_c(q->formant_mem + 10,
q->formant_mem + 10,
160),
160, 0.9375, &q->postfilter_agc_mem);
}