virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

aacdec_usac: rename spectrum decode function and remove unused arg

Browse Source 
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.
This commit is contained in:
Lynne 2024-06-12 03:25:07 +02:00
parent 11a8e0a4e5
commit d79fbad366
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/aac/aacdec_usac.c
View File

@ -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;
}