diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-12-24 21:32:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-28 21:06:54 +0100 |
| commit | 1208872946c8c66a59df709c901b4dc1e84efb69 (patch) | |
| tree | e3faf9fd8f645dfb25d1e061179c3748bf4c3c56 | |
| parent | 78d6d8ddb571ecca54616517defbf894a45ea9c3 (diff) | |
avcodec/siren: remove constant region_size
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/siren.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 3d0cdd4554..2d72fb9572 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -353,6 +353,7 @@ static const float noise_category6[20] = { }; #define FRAME_SIZE 320 +#define REGION_SIZE 20 typedef struct SirenContext { GetBitContext gb; @@ -362,7 +363,6 @@ typedef struct SirenContext { int number_of_regions; int scale_factor; int sample_rate_bits; - int region_size; unsigned dw1, dw2, dw3, dw4; @@ -403,7 +403,6 @@ static av_cold int siren_init(AVCodecContext *avctx) s->esf_adjustment = 7; s->number_of_regions = 14; s->scale_factor = 22; - s->region_size = 20; s->dw1 = s->dw2 = s->dw3 = s->dw4 = 1; for (i = 0; i < 64; i++) { @@ -575,7 +574,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, for (region = 0; region < number_of_regions; region++) { category = power_categories[region]; - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category >= 0 && category < 7) { decoder_tree = decoder_tables[category]; @@ -624,11 +623,11 @@ static int decode_vector(SirenContext *s, int number_of_regions, } } - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category == 5) { i = 0; - for (j = 0; j < s->region_size; j++) { + for (j = 0; j < REGION_SIZE; j++) { if (*coefs_ptr != 0) i++; coefs_ptr++; @@ -637,7 +636,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, noise = decoder_standard_deviation[region] * noise_category5[i]; } else if (category == 6) { i = 0; - for (j = 0; j < s->region_size; j++) { + for (j = 0; j < REGION_SIZE; j++) { if (*coefs_ptr++ != 0) i++; } @@ -649,7 +648,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, noise = 0; } - coefs_ptr = coefs + (region * s->region_size); + coefs_ptr = coefs + (region * REGION_SIZE); if (category == 5 || category == 6 || category == 7) { dw1 = get_dw(s); |