diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 16:28:48 +0200 |
| commit | 416d2f7a1244e7e93e291786ac98313153f87db5 (patch) | |
| tree | 231d0d704cda257e4bc2a210df6b2fe553f407c6 /libavcodec/amrnbdec.c | |
| parent | fb6fb0dedbc103ba9cd4e7d63edee15317143b21 (diff) | |
| parent | 7627c35a81241c98768d2d1f13d576591cac0b1c (diff) | |
| download | ffmpeg-416d2f7a1244e7e93e291786ac98313153f87db5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: export some functions
configure: use HOSTCC_C/O in check_host_cc
configure: use AS_O setting in check_as
configure: use LD_O setting in check_ld()
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
build: Restore dependency of acelp_filters.o on celp_math.o
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
celp_math: Move ff_cos() to the only place it is used
build: Use portable abstraction for linker/hostcc output file syntax
configure: Fix shared library creation for OpenBSD
vp56: Don't use DECLARE_ALIGN on a typedef name
mss1: move code that will be reused by MSS2 decoder into separate file
mss1: merge decode_intra() and decode_inter()
avprobe: Get rid of ugly casts in the options table
vf_hqdn3d: Remove a duplicate inline declaration
Conflicts:
Makefile
configure
ffprobe.c
libavcodec/Makefile
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/dsputil.c
libavcodec/lsp.c
libavcodec/mss1.c
libavcodec/ra288.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrnbdec.c')
| -rw-r--r-- | libavcodec/amrnbdec.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 04c921c05b..b6b93dce9c 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -44,6 +44,7 @@ #include <math.h> #include "avcodec.h" +#include "dsputil.h" #include "libavutil/common.h" #include "libavutil/avassert.h" #include "celp_math.h" @@ -798,7 +799,7 @@ static int synthesis(AMRContext *p, float *lpc, // emphasize pitch vector contribution if (p->pitch_gain[4] > 0.5 && !overflow) { float energy = p->celpm_ctx.dot_productf(excitation, excitation, - AMR_SUBFRAME_SIZE); + AMR_SUBFRAME_SIZE); float pitch_factor = p->pitch_gain[4] * (p->cur_frame_mode == MODE_12k2 ? @@ -899,7 +900,7 @@ static void postfilter(AMRContext *p, float *lpc, float *buf_out) float *samples = p->samples_in + LP_FILTER_ORDER; // Start of input float speech_gain = p->celpm_ctx.dot_productf(samples, samples, - AMR_SUBFRAME_SIZE); + AMR_SUBFRAME_SIZE); float pole_out[AMR_SUBFRAME_SIZE + LP_FILTER_ORDER]; // Output of pole filter const float *gamma_n, *gamma_d; // Formant filter factor table @@ -1005,8 +1006,10 @@ static int amrnb_decode_frame(AVCodecContext *avctx, void *data, p->fixed_gain[4] = ff_amr_set_fixed_gain(fixed_gain_factor, - p->celpm_ctx.dot_productf(p->fixed_vector, p->fixed_vector, - AMR_SUBFRAME_SIZE)/AMR_SUBFRAME_SIZE, + p->celpm_ctx.dot_productf(p->fixed_vector, + p->fixed_vector, + AMR_SUBFRAME_SIZE) / + AMR_SUBFRAME_SIZE, p->prediction_error, energy_mean[p->cur_frame_mode], energy_pred_fac); |