Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mips/aacsbr: port to lavu/tx

Browse Source 
Fixes compilation after the recent commit which ported the C code to lavu/tx.
pull/388/head
Lynne 2 years ago
parent 26cb36f357
commit a07c8781ce
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/mips/aacsbr_mips.h

12
libavcodec/mips/aacsbr_mips.h
Unescape View File

@ -59,7 +59,7 @@
#include "libavutil/mips/asmdefs.h" #include "libavutil/mips/asmdefs.h"
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct, static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, AVTXContext *mdct, av_tx_fn mdct_fn,
SBRDSPContext *sbrdsp, const float *in, float *x, SBRDSPContext *sbrdsp, const float *in, float *x,
float z[320], float W[2][32][32][2], int buf_idx) float z[320], float W[2][32][32][2], int buf_idx)
{ {
@ -143,7 +143,7 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct,
fdsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320); fdsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320);
sbrdsp->sum64x5(z); sbrdsp->sum64x5(z);
sbrdsp->qmf_pre_shuffle(z); sbrdsp->qmf_pre_shuffle(z);
mdct->imdct_half(mdct, z, z+64); mdct_fn(mdct, z, z+64, sizeof(float));
sbrdsp->qmf_post_shuffle(W[buf_idx][i], z); sbrdsp->qmf_post_shuffle(W[buf_idx][i], z);
x += 32; x += 32;
} }
@ -151,7 +151,7 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct,
#if HAVE_MIPSFPU #if HAVE_MIPSFPU
#if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6
static void sbr_qmf_synthesis_mips(FFTContext *mdct, static void sbr_qmf_synthesis_mips(AVTXContext *mdct, av_tx_fn mdct_fn,
SBRDSPContext *sbrdsp, AVFloatDSPContext *fdsp, SBRDSPContext *sbrdsp, AVFloatDSPContext *fdsp,
float *out, float X[2][38][64], float *out, float X[2][38][64],
float mdct_buf[2][64], float mdct_buf[2][64],
@ -180,12 +180,12 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct,
X[0][i][ n] = -X[0][i][n]; X[0][i][ n] = -X[0][i][n];
X[0][i][32+n] = X[1][i][31-n]; X[0][i][32+n] = X[1][i][31-n];
} }
mdct->imdct_half(mdct, mdct_buf[0], X[0][i]); mdct_fn(mdct, mdct_buf[0], X[0][i], sizeof(float));
sbrdsp->qmf_deint_neg(v, mdct_buf[0]); sbrdsp->qmf_deint_neg(v, mdct_buf[0]);
} else { } else {
sbrdsp->neg_odd_64(X[1][i]); sbrdsp->neg_odd_64(X[1][i]);
mdct->imdct_half(mdct, mdct_buf[0], X[0][i]); mdct_fn(mdct, mdct_buf[0], X[0][i], sizeof(float));
mdct->imdct_half(mdct, mdct_buf[1], X[1][i]); mdct_fn(mdct, mdct_buf[1], X[1][i], sizeof(float));
sbrdsp->qmf_deint_bfly(v, mdct_buf[1], mdct_buf[0]); sbrdsp->qmf_deint_bfly(v, mdct_buf[1], mdct_buf[0]);
} }

Write Preview
Loading…
Cancel
Save