RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/siren: remove constant region_size 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-12-24 21:32:41 +01:00
parent 78d6d8ddb5
commit 1208872946
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/siren.c
View File

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