diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 17:58:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 17:58:28 +0200 |
| commit | 99497b4683e5054bcdc5b6802a27d717df9e04f3 (patch) | |
| tree | 130022374c1a92b72288272bd0927ae6ac7d825b /libavcodec/acelp_pitch_delay.h | |
| parent | 0dae193d3ecf5d0dc687f5ad708419bf7600de9a (diff) | |
| parent | 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 (diff) | |
| download | ffmpeg-99497b4683e5054bcdc5b6802a27d717df9e04f3.tar.gz | |
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_pitch_delay.h')
| -rw-r--r-- | libavcodec/acelp_pitch_delay.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/acelp_pitch_delay.h b/libavcodec/acelp_pitch_delay.h index 72977f1f49..2aade2f226 100644 --- a/libavcodec/acelp_pitch_delay.h +++ b/libavcodec/acelp_pitch_delay.h @@ -24,7 +24,8 @@ #define AVCODEC_ACELP_PITCH_DELAY_H #include <stdint.h> -#include "dsputil.h" + +#include "audiodsp.h" #define PITCH_DELAY_MIN 20 #define PITCH_DELAY_MAX 143 @@ -139,7 +140,7 @@ void ff_acelp_update_past_gain( /** * @brief Decode the adaptive codebook gain and add * correction (4.1.5 and 3.9.1 of G.729). - * @param dsp initialized dsputil context + * @param adsp initialized audio DSP context * @param gain_corr_factor gain correction factor (2.13) * @param fc_v fixed-codebook vector (2.13) * @param mr_energy mean innovation energy and fixed-point correction (7.13) @@ -208,7 +209,7 @@ void ff_acelp_update_past_gain( * @remark The routine is used in G.729 and AMR (all modes). */ int16_t ff_acelp_decode_gain_code( - DSPContext *dsp, + AudioDSPContext *adsp, int gain_corr_factor, const int16_t* fc_v, int mr_energy, |