History

aac: remove dead SBR input scaling

It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71

Alex Converse committed 15 years ago

Commit 916dee91 parent aabc2681 file · +3 −7Browse files

Unified · Split

libavcodec/aacsbr.c+3−7
@@ -1134,16 +1134,12 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac) · 1133 unmodified lines
1134 * @param W array of complex-valued samples split into subbands1134 * @param W array of complex-valued samples split into subbands
1135 */1135 */
1136static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x,1136static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x,
1137 float z[320], float W[2][32][32][2],1137 float z[320], float W[2][32][32][2])
1138 float scale)
1139{1138{
1140 int i, k;1139 int i, k;
1141 memcpy(W[0], W[1], sizeof(W[0]));1140 memcpy(W[0], W[1], sizeof(W[0]));
1142 memcpy(x , x+1024, (320-32)*sizeof(x[0]));1141 memcpy(x , x+1024, (320-32)*sizeof(x[0]));
1143 if (scale != 1.0f)1142 memcpy(x+288, in, 1024*sizeof(x[0]));
1144 dsp->vector_fmul_scalar(x+288, in, scale, 1024);
1145 else
1146 memcpy(x+288, in, 1024*sizeof(*x));
1147 for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames1143 for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames
1148 // are not supported1144 // are not supported
1149 dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320);1145 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, · 572 unmodified lines
1722 /* decode channel */1718 /* decode channel */
1723 sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,1719 sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
1724 (float*)sbr->qmf_filter_scratch,1720 (float*)sbr->qmf_filter_scratch,
1725 sbr->data[ch].W, 1/(-1024 * ac->sf_scale));1721 sbr->data[ch].W);
1726 sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W);1722 sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W);
1727 if (sbr->start) {1723 if (sbr->start) {
1728 sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);1724 sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t