diff options
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index e3e19422a4..fa6ac04785 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -165,7 +165,7 @@ static const int32_t scale_factor_mult2[3][3] = { * Convert region offsets to region sizes and truncate * size to big_values. */ -static void ff_region_offset2size(GranuleDef *g) +static void region_offset2size(GranuleDef *g) { int i, k, j = 0; g->region_size[2] = 576 / 2; @@ -176,7 +176,7 @@ static void ff_region_offset2size(GranuleDef *g) } } -static void ff_init_short_region(MPADecodeContext *s, GranuleDef *g) +static void init_short_region(MPADecodeContext *s, GranuleDef *g) { if (g->block_type == 2) { if (s->sample_rate_index != 8) @@ -194,7 +194,8 @@ static void ff_init_short_region(MPADecodeContext *s, GranuleDef *g) g->region_size[1] = (576 / 2); } -static void ff_init_long_region(MPADecodeContext *s, GranuleDef *g, int ra1, int ra2) +static void init_long_region(MPADecodeContext *s, GranuleDef *g, + int ra1, int ra2) { int l; g->region_size[0] = band_index_long[s->sample_rate_index][ra1 + 1] >> 1; @@ -203,7 +204,7 @@ static void ff_init_long_region(MPADecodeContext *s, GranuleDef *g, int ra1, int g->region_size[1] = band_index_long[s->sample_rate_index][ l] >> 1; } -static void ff_compute_band_indexes(MPADecodeContext *s, GranuleDef *g) +static void compute_band_indexes(MPADecodeContext *s, GranuleDef *g) { if (g->block_type == 2) { if (g->switch_point) { @@ -1354,7 +1355,7 @@ static int mp_decode_layer3(MPADecodeContext *s) g->table_select[i] = get_bits(&s->gb, 5); for (i = 0; i < 3; i++) g->subblock_gain[i] = get_bits(&s->gb, 3); - ff_init_short_region(s, g); + init_short_region(s, g); } else { int region_address1, region_address2; g->block_type = 0; @@ -1366,10 +1367,10 @@ static int mp_decode_layer3(MPADecodeContext *s) region_address2 = get_bits(&s->gb, 3); av_dlog(s->avctx, "region1=%d region2=%d\n", region_address1, region_address2); - ff_init_long_region(s, g, region_address1, region_address2); + init_long_region(s, g, region_address1, region_address2); } - ff_region_offset2size(g); - ff_compute_band_indexes(s, g); + region_offset2size(g); + compute_band_indexes(s, g); g->preflag = 0; if (!s->lsf) |