aacdec_usac: rename noise_scale to noise_bands

This was a typo.

Lynne committed 2 years ago

Commit a381cbc1 parent 89de2f02 files · +3 −3Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files

libavcodec/aac/aacdec.h +1 −1
libavcodec/aac/aacdec_usac.c +2 −2

libavcodec/aac/aacdec.h+1−1

@@ -315,7 +315,7 @@ typedef struct AACUsacElemConfig { · 314 unmodified lines
315		315
316	uint8_t freq_scale; /* dflt_freq_scale */	316	uint8_t freq_scale; /* dflt_freq_scale */
317	uint8_t alter_scale : 1; /* dflt_alter_scale */	317	uint8_t alter_scale : 1; /* dflt_alter_scale */
318	uint8_t noise_scale; /* dflt_noise_scale */	318	uint8_t noise_bands; /* dflt_noise_bands */
319		319
320	uint8_t limiter_bands; /* dflt_limiter_bands */	320	uint8_t limiter_bands; /* dflt_limiter_bands */
321	uint8_t limiter_gains; /* dflt_limiter_gains */	321	uint8_t limiter_gains; /* dflt_limiter_gains */

libavcodec/aac/aacdec_usac.c+2−2

@@ -162,11 +162,11 @@ static void decode_usac_sbr_data(AACUsacElemConfig e, GetBitContext gb) · 161 unmodified lines
162		162
163	e->sbr.dflt.freq_scale = 2;	163	e->sbr.dflt.freq_scale = 2;
164	e->sbr.dflt.alter_scale = 1;	164	e->sbr.dflt.alter_scale = 1;
165	e->sbr.dflt.noise_scale = 2;	165	e->sbr.dflt.noise_bands = 2;
166	if (header_extra1) {	166	if (header_extra1) {
167	e->sbr.dflt.freq_scale = get_bits(gb, 2); /* dflt_freq_scale */	167	e->sbr.dflt.freq_scale = get_bits(gb, 2); /* dflt_freq_scale */
168	e->sbr.dflt.alter_scale = get_bits1(gb); /* dflt_alter_scale */	168	e->sbr.dflt.alter_scale = get_bits1(gb); /* dflt_alter_scale */
169	e->sbr.dflt.noise_scale = get_bits(gb, 2); /* dflt_noise_scale */	169	e->sbr.dflt.noise_bands = get_bits(gb, 2); /* dflt_noise_bands */
170	}	170	}
171		171
172	e->sbr.dflt.limiter_bands = 2;	172	e->sbr.dflt.limiter_bands = 2;