diff options
| author | Lynne <dev@lynne.ee> | 2024-03-16 02:19:35 +0100 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2024-04-23 08:31:35 +0200 |
| commit | 5c026e66372f31c7bdeccc45511c9f5eeac22865 (patch) | |
| tree | 6ffd08feb4333ef4b6aa3d09d3677371cfe5ef7a /libavcodec/aacdec_template.c | |
| parent | eef9100a8e57fe9d0642aeb69c82a5abfc01e962 (diff) | |
| download | ffmpeg-5c026e66372f31c7bdeccc45511c9f5eeac22865.tar.gz | |
aacdec: remove unnecessary decode_spectrum_and_dequant arguments
Small cleanup to reduce number of arguments.
Diffstat (limited to 'libavcodec/aacdec_template.c')
| -rw-r--r-- | libavcodec/aacdec_template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index a8fb8606e1..01ae847264 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1610,12 +1610,13 @@ static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb, * * @return Returns error status. 0 - OK, !0 - error */ -static int decode_spectrum_and_dequant(AACDecContext *ac, INTFLOAT coef[1024], +static int decode_spectrum_and_dequant(AACDecContext *ac, GetBitContext *gb, - int pulse_present, const Pulse *pulse, + const Pulse *pulse, SingleChannelElement *sce) { int i, k, g, idx = 0; + INTFLOAT *coef = sce->AAC_RENAME(coeffs); IndividualChannelStream *ics = &sce->ics; const int c = 1024 / ics->num_windows; const uint16_t *offsets = ics->swb_offset; @@ -1856,7 +1857,7 @@ static int decode_spectrum_and_dequant(AACDecContext *ac, INTFLOAT coef[1024], coef += g_len << 7; } - if (pulse_present) { + if (pulse) { idx = 0; for (i = 0; i < pulse->num_pulse; i++) { INTFLOAT co = coef_base[ pulse->pos[i] ]; @@ -1977,7 +1978,6 @@ static int decode_ics(AACDecContext *ac, SingleChannelElement *sce, Pulse pulse; TemporalNoiseShaping *tns = &sce->tns; IndividualChannelStream *ics = &sce->ics; - INTFLOAT *out = sce->AAC_RENAME(coeffs); int global_gain, eld_syntax, er_syntax, pulse_present = 0; int ret; @@ -2047,9 +2047,9 @@ static int decode_ics(AACDecContext *ac, SingleChannelElement *sce, } } - ret = decode_spectrum_and_dequant(ac, out, gb, - pulse_present, - &pulse, sce); + ret = decode_spectrum_and_dequant(ac, gb, + pulse_present ? &pulse : NULL, + sce); if (ret < 0) goto fail; |