generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aac: remove dead SBR input scaling

Browse Source 
It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 916dee9f45dab85cfc20b6bf63ce8722746e6508)
This commit is contained in:
Alex Converse 2011-02-13 16:42:38 -08:00 committed by Michael Niedermayer
parent 288b62b1b9
commit 4a7d992437
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/aacsbr.c
View File

@ -1134,16 +1134,12 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac)
* @param W array of complex-valued samples split into subbands * @param W array of complex-valued samples split into subbands
*/ */
static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x, static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x,
float z[320], float W[2][32][32][2], float z[320], float W[2][32][32][2])
float scale)
{ {
int i, k; int i, k;
memcpy(W[0], W[1], sizeof(W[0])); memcpy(W[0], W[1], sizeof(W[0]));
memcpy(x , x+1024, (320-32)*sizeof(x[0])); memcpy(x , x+1024, (320-32)*sizeof(x[0]));
if (scale != 1.0f) memcpy(x+288, in, 1024*sizeof(x[0]));
dsp->vector_fmul_scalar(x+288, in, scale, 1024);
else
memcpy(x+288, in, 1024*sizeof(*x));
for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames
// are not supported // are not supported
dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320); dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320);
@ -1722,7 +1718,7 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac,
/* decode channel */ /* decode channel */
sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, ch ? R : L, sbr->data[ch].analysis_filterbank_samples, sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
(float*)sbr->qmf_filter_scratch, (float*)sbr->qmf_filter_scratch,
sbr->data[ch].W, 1/(-1024 * ac->sf_scale)); sbr->data[ch].W);
sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W); sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W);
if (sbr->start) { if (sbr->start) {
sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]); sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);