History

aacdec: template LTP windowing separately

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.

Lynne committed 2 years ago

Commit eef91001 parent 091d8524 files · +58 −36Browse files

Showing the changes to libavcodec (4 of 4 files). Show all

Unified · Split

4 files
  1. libavcodec/aac/aacdec_dsp_template.c +29 −1
  2. libavcodec/aacdec.h +0 −6
  3. libavcodec/aacdec_template.c +0 −28
  4. libavcodec/mips/aacdec_mips.c +29 −1
libavcodec/aac/aacdec_dsp_template.c+29−1
@@ -237,6 +237,34 @@ static void AAC_RENAME(apply_tns)(void *_coef_param, TemporalNoiseShaping *tns, · 236 unmodified lines
237237 }
238238 }
239239
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+
240268 /**
241269 * Apply the long term prediction
242270 */
@@ -257,7 +285,7 @@ static void AAC_RENAME(apply_ltp)(AACDecContext *ac, SingleChannelElement *sce) · 14 unmodified lines
257285 predTime[i] = AAC_MUL30(sce->AAC_RENAME(ltp_state)[i + 2048 - ltp->lag], ltp->AAC_RENAME(coef));
258286 memset(&predTime[i], 0, (2048 - i) * sizeof(*predTime));
259287
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);
261289
262290 if (sce->tns.present)
263291 AAC_RENAME(apply_tns)(predFreq, &sce->tns, &sce->ics, 0);
libavcodec/aacdec.h+0−6
@@ -311,12 +311,6 @@ struct AACDecContext { · 310 unmodified lines
311311 int is_fixed;
312312
313313 /* 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− };
320314 void (*vector_pow43)(int *coefs, int len);
321315 void (*subband_scale)(int *dst, int *src, int scale, int offset, int len, void *log_context);
322316 };
libavcodec/aacdec_template.c+0−28
@@ -2367,33 +2367,6 @@ static int decode_extension_payload(AACDecContext *ac, GetBitContext *gb, int cn · 2366 unmodified lines
23672367 return res;
23682368 }
23692369
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−
23972370 /**
23982371 * channel coupling transformation interface
23992372 *
@@ -2919,7 +2892,6 @@ static int aac_decode_frame(AVCodecContext *avctx, AVFrame *frame, · 519 unmodified lines
29192892
29202893 static void aacdec_init(AACDecContext *c)
29212894 {
2922− c->AAC_RENAME(windowing_and_mdct_ltp) = windowing_and_mdct_ltp;
29232895 #if USE_FIXED
29242896 c->vector_pow43 = vector_pow43;
29252897 c->subband_scale = subband_scale;
libavcodec/mips/aacdec_mips.c+29−1
@@ -224,6 +224,34 @@ static void imdct_and_windowing_mips(AACDecContext *ac, SingleChannelElement *sc · 223 unmodified lines
224224 }
225225 }
226226
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+
227255 static void apply_ltp_mips(AACDecContext *ac, SingleChannelElement *sce)
228256 {
229257 const LongTermPrediction *ltp = &sce->ics.ltp;
@@ -272,7 +300,7 @@ static void apply_ltp_mips(AACDecContext *ac, SingleChannelElement *sce) · 42 unmodified lines
272300 );
273301 }
274302
275− ac->windowing_and_mdct_ltp(ac, predFreq, predTime, &sce->ics);
303+ windowing_and_mdct_ltp(ac, predFreq, predTime, &sce->ics);
276304
277305 if (sce->tns.present)
278306 ac->dsp.apply_tns(predFreq, &sce->tns, &sce->ics, 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