LAV
/
FFmpeg
1
0
Fork 0
Code

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>
This commit is contained in:
Andreas Rheinhardt 2024-02-25 23:12:34 +01:00
parent 80eca6ec99
commit 6c92347ab9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacsbr.h
View File

@ -36,6 +36,8 @@
#define ENVELOPE_ADJUSTMENT_OFFSET 2 #define ENVELOPE_ADJUSTMENT_OFFSET 2
#define NOISE_FLOOR_OFFSET 6 #define NOISE_FLOOR_OFFSET 6
struct AACDecContext;
/** /**
* SBR VLC tables * SBR VLC tables
*/ */

4
libavcodec/aacsbr_template.c
View File

@ -1243,7 +1243,7 @@ static void sbr_qmf_synthesis(AVTXContext *mdct, av_tx_fn mdct_fn,
#endif #endif
/// Generate the subband filtered lowband /// 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], INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2],
int buf_idx) 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, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
(INTFLOAT*)sbr->qmf_filter_scratch, (INTFLOAT*)sbr->qmf_filter_scratch,
sbr->data[ch].W, sbr->data[ch].Ypos); 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, (const INTFLOAT (*)[32][32][2]) sbr->data[ch].W,
sbr->data[ch].Ypos); sbr->data[ch].Ypos);
sbr->data[ch].Ypos ^= 1; sbr->data[ch].Ypos ^= 1;

2
libavcodec/mips/aacsbr_mips.c
View File

@ -60,7 +60,7 @@
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
#if HAVE_MIPSFPU #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], float X_low[32][40][2], const float W[2][32][32][2],
int buf_idx) int buf_idx)
{ {

4
libavcodec/sbr.h
View File

@ -37,8 +37,6 @@
#include "aacps.h" #include "aacps.h"
#include "sbrdsp.h" #include "sbrdsp.h"
struct AACDecContext;
/** /**
* Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header. * 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 * aacsbr functions pointers
*/ */
typedef struct AACSBRContext { 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], INTFLOAT X_low[32][40][2], const INTFLOAT W[2][32][32][2],
int buf_idx); int buf_idx);
void (*sbr_hf_assemble)(INTFLOAT Y1[38][64][2], void (*sbr_hf_assemble)(INTFLOAT Y1[38][64][2],