RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

10l: The SBR refactor requires the use of 2 independent output X buffers. 

Originally committed as revision 23014 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-05-03 19:21:35 +00:00
parent b05394a081
commit 17d5959998
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aacsbr.c
View File

@ -1750,15 +1750,15 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac,
} }
/* synthesis */ /* synthesis */
sbr_x_gen(sbr, sbr->X, sbr->X_low, sbr->data[ch].Y, ch); sbr_x_gen(sbr, sbr->X[ch], sbr->X_low, sbr->data[ch].Y, ch);
} }
sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, L, sbr->X, sbr->qmf_filter_scratch, sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, L, sbr->X[0], sbr->qmf_filter_scratch,
sbr->data[0].synthesis_filterbank_samples, sbr->data[0].synthesis_filterbank_samples,
&sbr->data[0].synthesis_filterbank_samples_offset, &sbr->data[0].synthesis_filterbank_samples_offset,
downsampled, downsampled,
ac->add_bias, -1024 * ac->sf_scale); ac->add_bias, -1024 * ac->sf_scale);
if (nch == 2) if (nch == 2)
sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, R, sbr->X, sbr->qmf_filter_scratch, sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, R, sbr->X[1], sbr->qmf_filter_scratch,
sbr->data[1].synthesis_filterbank_samples, sbr->data[1].synthesis_filterbank_samples,
&sbr->data[1].synthesis_filterbank_samples_offset, &sbr->data[1].synthesis_filterbank_samples_offset,
downsampled, downsampled,

2
libavcodec/sbr.h
View File

@ -157,7 +157,7 @@ typedef struct {
///QMF output of the HF generator ///QMF output of the HF generator
float X_high[64][40][2]; float X_high[64][40][2];
///QMF values of the reconstructed signal ///QMF values of the reconstructed signal
DECLARE_ALIGNED(16, float, X)[2][32][64]; DECLARE_ALIGNED(16, float, X)[2][2][32][64];
///Zeroth coefficient used to filter the subband signals ///Zeroth coefficient used to filter the subband signals
float alpha0[64][2]; float alpha0[64][2];
///First coefficient used to filter the subband signals ///First coefficient used to filter the subband signals