har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.

Browse Source
This commit is contained in:
Justin Ruggles 2011-05-15 11:07:29 -04:00
parent 7f995abed3
commit 033a4a942a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac.h
View File

@ -227,7 +227,7 @@ typedef struct {
DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT
DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap
DECLARE_ALIGNED(32, float, ret)[2048]; ///< PCM output DECLARE_ALIGNED(32, float, ret)[2048]; ///< PCM output
DECLARE_ALIGNED(16, int16_t, ltp_state)[3072]; ///< time signal for LTP DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP
PredictorState predictor_state[MAX_PREDICTORS]; PredictorState predictor_state[MAX_PREDICTORS];
} SingleChannelElement; } SingleChannelElement;

6
libavcodec/aacdec.c
View File

@ -1820,9 +1820,9 @@ static void update_ltp(AACContext *ac, SingleChannelElement *sce)
saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * lwindow[511 - i]; saved_ltp[i + 512] = ac->buf_mdct[1023 - i] * lwindow[511 - i];
} }
memcpy(sce->ltp_state, &sce->ltp_state[1024], 1024 * sizeof(int16_t)); memcpy(sce->ltp_state, sce->ltp_state+1024, 1024 * sizeof(*sce->ltp_state));
ac->fmt_conv.float_to_int16(&(sce->ltp_state[1024]), sce->ret, 1024); memcpy(sce->ltp_state+1024, sce->ret, 1024 * sizeof(*sce->ltp_state));
ac->fmt_conv.float_to_int16(&(sce->ltp_state[2048]), saved_ltp, 1024); memcpy(sce->ltp_state+2048, saved_ltp, 1024 * sizeof(*sce->ltp_state));
} }
/** /**