The function is called only internally in DSP, so we do not need to expose it. apply_ltp on MIPS uses this function, but due to the function being just a glue function with no real optimizations, duplicate it there.
Showing the changes to libavcodec (4 of 4 files). Show all
Unified · Split
| @@ -237,6 +237,34 @@ static void AAC_RENAME(apply_tns)(void *_coef_param, TemporalNoiseShaping *tns, · 236 unmodified lines | |||
| 237 | } | 237 | } |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | /** | ||
| 241 | * Apply windowing and MDCT to obtain the spectral | ||
| 242 | * coefficient from the predicted sample by LTP. | ||
| 243 | */ | ||
| 244 | static inline void AAC_RENAME(windowing_and_mdct_ltp)(AACDecContext *ac, | ||
| 245 | INTFLOAT *out, INTFLOAT *in, | ||
| 246 | IndividualChannelStream *ics) | ||
| 247 | { | ||
| 248 | const INTFLOAT *lwindow = ics->use_kb_window[0] ? AAC_RENAME2(aac_kbd_long_1024) : AAC_RENAME2(sine_1024); | ||
| 249 | const INTFLOAT *swindow = ics->use_kb_window[0] ? AAC_RENAME2(aac_kbd_short_128) : AAC_RENAME2(sine_128); | ||
| 250 | const INTFLOAT *lwindow_prev = ics->use_kb_window[1] ? AAC_RENAME2(aac_kbd_long_1024) : AAC_RENAME2(sine_1024); | ||
| 251 | const INTFLOAT *swindow_prev = ics->use_kb_window[1] ? AAC_RENAME2(aac_kbd_short_128) : AAC_RENAME2(sine_128); | ||
| 252 | |||
| 253 | if (ics->window_sequence[0] != LONG_STOP_SEQUENCE) { | ||
| 254 | ac->fdsp->vector_fmul(in, in, lwindow_prev, 1024); | ||
| 255 | } else { | ||
| 256 | memset(in, 0, 448 * sizeof(*in)); | ||
| 257 | ac->fdsp->vector_fmul(in + 448, in + 448, swindow_prev, 128); | ||
| 258 | } | ||
| 259 | if (ics->window_sequence[0] != LONG_START_SEQUENCE) { | ||
| 260 | ac->fdsp->vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024); | ||
| 261 | } else { | ||
| 262 | ac->fdsp->vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128); | ||
| 263 | memset(in + 1024 + 576, 0, 448 * sizeof(*in)); | ||
| 264 | } | ||
| 265 | ac->mdct_ltp_fn(ac->mdct_ltp, out, in, sizeof(INTFLOAT)); | ||
| 266 | } | ||
| 267 | |||
| 240 | /** | 268 | /** |
| 241 | * Apply the long term prediction | 269 | * Apply the long term prediction |
| 242 | */ | 270 | */ |
| @@ -257,7 +285,7 @@ static void AAC_RENAME(apply_ltp)(AACDecContext *ac, SingleChannelElement *sce) · 14 unmodified lines | |||
| 257 | predTime[i] = AAC_MUL30(sce->AAC_RENAME(ltp_state)[i + 2048 - ltp->lag], ltp->AAC_RENAME(coef)); | 285 | predTime[i] = AAC_MUL30(sce->AAC_RENAME(ltp_state)[i + 2048 - ltp->lag], ltp->AAC_RENAME(coef)); |
| 258 | memset(&predTime[i], 0, (2048 - i) * sizeof(*predTime)); | 286 | memset(&predTime[i], 0, (2048 - i) * sizeof(*predTime)); |
| 259 | 287 | ||
| 260 | ac->AAC_RENAME(windowing_and_mdct_ltp)(ac, predFreq, predTime, &sce->ics); | 288 | AAC_RENAME(windowing_and_mdct_ltp)(ac, predFreq, predTime, &sce->ics); |
| 261 | 289 | ||
| 262 | if (sce->tns.present) | 290 | if (sce->tns.present) |
| 263 | AAC_RENAME(apply_tns)(predFreq, &sce->tns, &sce->ics, 0); | 291 | AAC_RENAME(apply_tns)(predFreq, &sce->tns, &sce->ics, 0); |
| @@ -311,12 +311,6 @@ struct AACDecContext { · 310 unmodified lines | |||
| 311 | int is_fixed; | 311 | int is_fixed; |
| 312 | 312 | ||
| 313 | /* aacdec functions pointers */ | 313 | /* aacdec functions pointers */ |
| 314 | union { | ||
| 315 | void (*windowing_and_mdct_ltp)(struct AACDecContext *ac, float *out, | ||
| 316 | float *in, IndividualChannelStream *ics); | ||
| 317 | void (*windowing_and_mdct_ltp_fixed)(struct AACDecContext *ac, int *out, | ||
| 318 | int *in, IndividualChannelStream *ics); | ||
| 319 | }; | ||
| 320 | void (*vector_pow43)(int *coefs, int len); | 314 | void (*vector_pow43)(int *coefs, int len); |
| 321 | void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context); | 315 | void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context); |
| 322 | }; | 316 | }; |
| @@ -2367,33 +2367,6 @@ static int decode_extension_payload(AACDecContext *ac, GetBitContext *gb, int cn · 2366 unmodified lines | |||
| 2367 | return res; | 2367 | return res; |
| 2368 | } | 2368 | } |
| 2369 | 2369 | ||
| 2370 | /** | ||
| 2371 | * Apply windowing and MDCT to obtain the spectral | ||
| 2372 | * coefficient from the predicted sample by LTP. | ||
| 2373 | */ | ||
| 2374 | static void windowing_and_mdct_ltp(AACDecContext *ac, INTFLOAT *out, | ||
| 2375 | INTFLOAT *in, IndividualChannelStream *ics) | ||
| 2376 | { | ||
| 2377 | const INTFLOAT *lwindow = ics->use_kb_window[0] ? AAC_RENAME2(aac_kbd_long_1024) : AAC_RENAME2(sine_1024); | ||
| 2378 | const INTFLOAT *swindow = ics->use_kb_window[0] ? AAC_RENAME2(aac_kbd_short_128) : AAC_RENAME2(sine_128); | ||
| 2379 | const INTFLOAT *lwindow_prev = ics->use_kb_window[1] ? AAC_RENAME2(aac_kbd_long_1024) : AAC_RENAME2(sine_1024); | ||
| 2380 | const INTFLOAT *swindow_prev = ics->use_kb_window[1] ? AAC_RENAME2(aac_kbd_short_128) : AAC_RENAME2(sine_128); | ||
| 2381 | |||
| 2382 | if (ics->window_sequence[0] != LONG_STOP_SEQUENCE) { | ||
| 2383 | ac->fdsp->vector_fmul(in, in, lwindow_prev, 1024); | ||
| 2384 | } else { | ||
| 2385 | memset(in, 0, 448 * sizeof(*in)); | ||
| 2386 | ac->fdsp->vector_fmul(in + 448, in + 448, swindow_prev, 128); | ||
| 2387 | } | ||
| 2388 | if (ics->window_sequence[0] != LONG_START_SEQUENCE) { | ||
| 2389 | ac->fdsp->vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024); | ||
| 2390 | } else { | ||
| 2391 | ac->fdsp->vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128); | ||
| 2392 | memset(in + 1024 + 576, 0, 448 * sizeof(*in)); | ||
| 2393 | } | ||
| 2394 | ac->mdct_ltp_fn(ac->mdct_ltp, out, in, sizeof(INTFLOAT)); | ||
| 2395 | } | ||
| 2396 | |||
| 2397 | /** | 2370 | /** |
| 2398 | * channel coupling transformation interface | 2371 | * channel coupling transformation interface |
| 2399 | * | 2372 | * |
| @@ -2919,7 +2892,6 @@ static int aac_decode_frame(AVCodecContext *avctx, AVFrame *frame, · 519 unmodified lines | |||
| 2919 | 2892 | ||
| 2920 | static void aacdec_init(AACDecContext *c) | 2893 | static void aacdec_init(AACDecContext *c) |
| 2921 | { | 2894 | { |
| 2922 | c->AAC_RENAME(windowing_and_mdct_ltp) = windowing_and_mdct_ltp; | ||
| 2923 | #if USE_FIXED | 2895 | #if USE_FIXED |
| 2924 | c->vector_pow43 = vector_pow43; | 2896 | c->vector_pow43 = vector_pow43; |
| 2925 | c->subband_scale = subband_scale; | 2897 | c->subband_scale = subband_scale; |
| @@ -224,6 +224,34 @@ static void imdct_and_windowing_mips(AACDecContext *ac, SingleChannelElement *sc · 223 unmodified lines | |||
| 224 | } | 224 | } |
| 225 | } | 225 | } |
| 226 | 226 | ||
| 227 | /** | ||
| 228 | * Apply windowing and MDCT to obtain the spectral | ||
| 229 | * coefficient from the predicted sample by LTP. | ||
| 230 | */ | ||
| 231 | static inline void windowing_and_mdct_ltp(AACDecContext *ac, | ||
| 232 | float *out, float *in, | ||
| 233 | IndividualChannelStream *ics) | ||
| 234 | { | ||
| 235 | const float *lwindow = ics->use_kb_window[0] ? ff_aac_kbd_long_1024) : ff_sine_1024; | ||
| 236 | const float *swindow = ics->use_kb_window[0] ? ff_aac_kbd_short_128) : ff_sine_128; | ||
| 237 | const float *lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_1024) : ff_sine_1024; | ||
| 238 | const float *swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128) : ff_sine_128; | ||
| 239 | |||
| 240 | if (ics->window_sequence[0] != LONG_STOP_SEQUENCE) { | ||
| 241 | ac->fdsp->vector_fmul(in, in, lwindow_prev, 1024); | ||
| 242 | } else { | ||
| 243 | memset(in, 0, 448 * sizeof(*in)); | ||
| 244 | ac->fdsp->vector_fmul(in + 448, in + 448, swindow_prev, 128); | ||
| 245 | } | ||
| 246 | if (ics->window_sequence[0] != LONG_START_SEQUENCE) { | ||
| 247 | ac->fdsp->vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024); | ||
| 248 | } else { | ||
| 249 | ac->fdsp->vector_fmul_reverse(in + 1024 + 448, in + 1024 + 448, swindow, 128); | ||
| 250 | memset(in + 1024 + 576, 0, 448 * sizeof(*in)); | ||
| 251 | } | ||
| 252 | ac->mdct_ltp_fn(ac->mdct_ltp, out, in, sizeof(INTFLOAT)); | ||
| 253 | } | ||
| 254 | |||
| 227 | static void apply_ltp_mips(AACDecContext *ac, SingleChannelElement *sce) | 255 | static void apply_ltp_mips(AACDecContext *ac, SingleChannelElement *sce) |
| 228 | { | 256 | { |
| 229 | const LongTermPrediction *ltp = &sce->ics.ltp; | 257 | const LongTermPrediction *ltp = &sce->ics.ltp; |
| @@ -272,7 +300,7 @@ static void apply_ltp_mips(AACDecContext *ac, SingleChannelElement *sce) · 42 unmodified lines | |||
| 272 | ); | 300 | ); |
| 273 | } | 301 | } |
| 274 | 302 | ||
| 275 | ac->windowing_and_mdct_ltp(ac, predFreq, predTime, &sce->ics); | 303 | windowing_and_mdct_ltp(ac, predFreq, predTime, &sce->ics); |
| 276 | 304 | ||
| 277 | if (sce->tns.present) | 305 | if (sce->tns.present) |
| 278 | ac->dsp.apply_tns(predFreq, &sce->tns, &sce->ics, 0); | 306 | ac->dsp.apply_tns(predFreq, &sce->tns, &sce->ics, 0); |