diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:45:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:46:35 +0100 |
commit | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (patch) | |
tree | ed098a84b05dde35955ca00471464be09a6eba78 /libavcodec/g722.c | |
parent | 38e641a060e0c00930851a8053ca96250b3ecccc (diff) | |
parent | 67690683130faf37dd9d969ced15eba2a1940ade (diff) | |
download | ffmpeg-47df21e1727c83648a645b0dde34e99f1b7bdc93.tar.gz |
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.c')
-rw-r--r-- | libavcodec/g722.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/g722.c b/libavcodec/g722.c index 2c04c40b56..19ee6662a8 100644 --- a/libavcodec/g722.c +++ b/libavcodec/g722.c @@ -72,16 +72,6 @@ const int16_t ff_g722_low_inv_quant6[64] = { }; /** - * quadrature mirror filter (QMF) coefficients - * - * ITU-T G.722 Table 11 - */ -static const int16_t qmf_coeffs[12] = { - 3, -11, 12, 32, -210, 951, 3876, -805, 362, -156, 53, -11, -}; - - -/** * adaptive predictor * * @param cur_diff the dequantized and scaled delta calculated from the @@ -157,15 +147,3 @@ void ff_g722_update_high_predictor(struct G722Band *band, const int dhigh, high_log_factor_step[ihigh&1], 0, 22528); band->scale_factor = linear_scale_factor(band->log_factor - (10 << 11)); } - -void ff_g722_apply_qmf(const int16_t *prev_samples, int *xout1, int *xout2) -{ - int i; - - *xout1 = 0; - *xout2 = 0; - for (i = 0; i < 12; i++) { - MAC16(*xout2, prev_samples[2*i ], qmf_coeffs[i ]); - MAC16(*xout1, prev_samples[2*i+1], qmf_coeffs[11-i]); - } -} |