ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | Sun Feb 25 23:12:34 2024 +0100| [6c92347ab9fb1a07664577a1b68e0a1724799e2b] | committer: Andreas Rheinhardt avcodec/sbr: Remove unused AACDecContext* parameter from sbr_lf_gen_mips Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c92347ab9fb1a0766...

libavcodec/aacsbr.h | 2 ++ libavcodec/aacsbr_template.c | 4 ++-- libavcodec/mips/aacsbr_mips.c | 2 +- libavcodec/sbr.h | 4 +--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index ad4935d734..cb680cc548 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -36,6 +36,8 @@ #define ENVELOPE_ADJUSTMENT_OFFSET 2 #define NOISE_FLOOR_OFFSET 6 +struct AACDecContext; + /** * SBR VLC tables */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index ce3834e2dc..cdfaed636b 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1243,7 +1243,7 @@ static void sbr_qmf_synthesis(AVTXContext *mdct, av_tx_fn mdct_fn, #endif /// Generate the subband filtered lowband -static int sbr_lf_gen(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx) { @@ -1493,7 +1493,7 @@ void AAC_RENAME(ff_sbr_apply)(AACDecContext *ac, SpectralBandReplication *sbr, i ch ? R : L, sbr->data[ch].analysis_filterbank_samples, (INTFLOAT*)sbr->qmf_filter_scratch, sbr->data[ch].W, sbr->data[ch].Ypos); - sbr->c.sbr_lf_gen(ac, sbr, sbr->X_low, + sbr->c.sbr_lf_gen(sbr, sbr->X_low, (const INTFLOAT (*)[32][32][2]) sbr->data[ch].W, sbr->data[ch].Ypos); sbr->data[ch].Ypos ^= 1; diff --git a/libavcodec/mips/aacsbr_mips.c b/libavcodec/mips/aacsbr_mips.c index 0dc09130b7..e0715491e6 100644 --- a/libavcodec/mips/aacsbr_mips.c +++ b/libavcodec/mips/aacsbr_mips.c @@ -60,7 +60,7 @@ #if HAVE_INLINE_ASM #if HAVE_MIPSFPU -static int sbr_lf_gen_mips(AACDecContext *ac, SpectralBandReplication *sbr, +static int sbr_lf_gen_mips(SpectralBandReplication *sbr, float X_low[32][40][2], const float W[2][32][32][2], int buf_idx) { diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 46c68615c8..fe3a39603a 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -37,8 +37,6 @@ #include "aacps.h" #include "sbrdsp.h" -struct AACDecContext; - /** * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. */ @@ -121,7 +119,7 @@ typedef struct SpectralBandReplication SpectralBandReplication; * aacsbr functions pointers */ typedef struct AACSBRContext { - int (*sbr_lf_gen)(struct AACDecContext *ac, SpectralBandReplication *sbr, + int (*sbr_lf_gen)(SpectralBandReplication *sbr, INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2], int buf_idx); void (*sbr_hf_assemble)(INTFLOAT Y1[38][64][2],