diff options
| author | Lynne <dev@lynne.ee> | 2024-06-12 03:25:07 +0200 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2024-06-12 03:33:45 +0200 |
| commit | d79fbad366896873d9d4d219cce9578797944dea (patch) | |
| tree | 7173df071fe2869ace982302cd73cef17c1d224f /libavcodec/aac/aacdec_usac.c | |
| parent | 11a8e0a4e585c0a5acf09397e39bccf45e1ba7ae (diff) | |
| download | ffmpeg-d79fbad366896873d9d4d219cce9578797944dea.tar.gz | |
aacdec_usac: rename spectrum decode function and remove unused arg
The LC part of the decoder combines scalefactor application with
spectrum decoding, and this was the plan here, but that's not possible,
so change the function name.
Diffstat (limited to 'libavcodec/aac/aacdec_usac.c')
| -rw-r--r-- | libavcodec/aac/aacdec_usac.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 100203ff71..81aba5ddf4 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -560,10 +560,9 @@ static int decode_usac_scale_factors(AACDecContext *ac, * * @return Returns error status. 0 - OK, !0 - error */ -static int decode_spectrum_and_dequant_ac(AACDecContext *s, float coef[1024], - GetBitContext *gb, const float sf[120], - AACArithState *state, int reset, - uint16_t len, uint16_t N) +static int decode_spectrum_ac(AACDecContext *s, float coef[1024], + GetBitContext *gb, AACArithState *state, + int reset, uint16_t len, uint16_t N) { AACArith ac; int i, a, b; @@ -1396,10 +1395,8 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac, else N = usac->core_frame_len; - ret = decode_spectrum_and_dequant_ac(ac, sce->coeffs + win*128, gb, - sce->sf, &ue->ac, - arith_reset_flag && (win == 0), - lg, N); + ret = decode_spectrum_ac(ac, sce->coeffs + win*128, gb, &ue->ac, + arith_reset_flag && (win == 0), lg, N); if (ret < 0) return ret; } |