virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

atrac3: Rename GainInfo to AtracGainInfo

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Maxim Poliakovski 2013-10-02 02:23:16 +02:00 committed by Michael Niedermayer
parent 746cb9bc53
commit dc80e250fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/atrac3.c
View File

@ -55,14 +55,14 @@
#define SAMPLES_PER_FRAME 1024 #define SAMPLES_PER_FRAME 1024
#define MDCT_SIZE 512 #define MDCT_SIZE 512
typedef struct GainInfo { typedef struct AtracGainInfo {
int num_gain_data; int num_gain_data;
int lev_code[8]; int lev_code[8];
int loc_code[8]; int loc_code[8];
} GainInfo; } AtracGainInfo;
typedef struct GainBlock { typedef struct GainBlock {
GainInfo g_block[4]; AtracGainInfo g_block[4];
} GainBlock; } GainBlock;
typedef struct TonalComponent { typedef struct TonalComponent {
@ -421,7 +421,7 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block,
int i, cf, num_data; int i, cf, num_data;
int *level, *loc; int *level, *loc;
GainInfo *gain = block->g_block; AtracGainInfo *gain = block->g_block;
for (i = 0; i <= num_bands; i++) { for (i = 0; i <= num_bands; i++) {
num_data = get_bits(gb, 3); num_data = get_bits(gb, 3);
@ -454,8 +454,8 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block,
* @param gain2 next band gain info * @param gain2 next band gain info
*/ */
static void gain_compensate_and_overlap(float *input, float *prev, static void gain_compensate_and_overlap(float *input, float *prev,
float *output, GainInfo *gain1, float *output, AtracGainInfo *gain1,
GainInfo *gain2) AtracGainInfo *gain2)
{ {
float g1, g2, gain_inc; float g1, g2, gain_inc;
int i, j, num_data, start_loc, end_loc; int i, j, num_data, start_loc, end_loc;