ffmpeg | branch: master | Lynne <d...@lynne.ee> | Sun Nov 6 17:37:21 2022 +0100| [a07c8781ce7cbb9b28d788e9a8b7f79d5b975ebb] | committer: Lynne
mips/aacsbr: port to lavu/tx Fixes compilation after the recent commit which ported the C code to lavu/tx. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a07c8781ce7cbb9b28d788e9a8b7f79d5b975ebb --- libavcodec/mips/aacsbr_mips.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mips/aacsbr_mips.h b/libavcodec/mips/aacsbr_mips.h index 4461e763ed..4750c94024 100644 --- a/libavcodec/mips/aacsbr_mips.h +++ b/libavcodec/mips/aacsbr_mips.h @@ -59,7 +59,7 @@ #include "libavutil/mips/asmdefs.h" #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, 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); sbrdsp->sum64x5(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); x += 32; } @@ -151,7 +151,7 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct, #if HAVE_MIPSFPU #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, float *out, float X[2][38][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][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]); } else { sbrdsp->neg_odd_64(X[1][i]); - mdct->imdct_half(mdct, mdct_buf[0], X[0][i]); - mdct->imdct_half(mdct, mdct_buf[1], X[1][i]); + mdct_fn(mdct, mdct_buf[0], X[0][i], sizeof(float)); + mdct_fn(mdct, mdct_buf[1], X[1][i], sizeof(float)); sbrdsp->qmf_deint_bfly(v, mdct_buf[1], mdct_buf[0]); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
