openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename sf_table in atrac.c unit to ff_atrac_sf_table.

Browse Source 
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 82e1f217f2)
This commit is contained in:
Diego Elio Pettenò 2011-01-24 23:36:10 +00:00 committed by Michael Niedermayer
parent f7e5cc0a2c
commit ee7fed27d4
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/atrac.c
View File

@ -32,7 +32,7 @@
#include "dsputil.h"
#include "atrac.h"
float sf_table[64];
float ff_atrac_sf_table[64];
static float qmf_window[48];
static const float qmf_48tap_half[24] = {
@ -54,9 +54,9 @@ void atrac_generate_tables(void)
float s;
/* Generate scale factors */
if (!sf_table[63])
if (!ff_atrac_sf_table[63])
for (i=0 ; i<64 ; i++)
sf_table[i] = pow(2.0, (i - 15) / 3.0);
ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0);
/* Generate the QMF window. */
if (!qmf_window[47])

3
libavcodec/atrac.h
View File

@ -28,8 +28,7 @@
#ifndef AVCODEC_ATRAC_H
#define AVCODEC_ATRAC_H
extern float sf_table[64];
extern float ff_atrac_sf_table[64];
void atrac_generate_tables(void);
void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);

2
libavcodec/atrac1.c
View File

@ -223,7 +223,7 @@ static int at1_unpack_dequant(GetBitContext* gb, AT1SUCtx* su,
int num_specs = specs_per_bfu[bfu_num];
int word_len = !!idwls[bfu_num] + idwls[bfu_num];
float scale_factor = sf_table[idsfs[bfu_num]];
float scale_factor = ff_atrac_sf_table[idsfs[bfu_num]];
bits_used += word_len * num_specs; /* add number of bits consumed by current BFU */
/* check for bitstream overflow */

4
libavcodec/atrac3.c
View File

@ -327,7 +327,7 @@ static int decodeSpectrum (GetBitContext *gb, float *pOut)
readQuantSpectralCoeffs (gb, subband_vlc_index[cnt], codingMode, mantissas, subbWidth);
/* Decode the scale factor for this subband. */
SF = sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];
SF = ff_atrac_sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];
/* Inverse quantize the coefficients. */
for (pIn=mantissas ; first<last; first++, pIn++)
@ -400,7 +400,7 @@ static int decodeTonalComponents (GetBitContext *gb, tonal_component *pComponent
coded_values = coded_values_per_component + 1;
coded_values = FFMIN(max_coded_values,coded_values);
scalefactor = sf_table[sfIndx] * iMaxQuant[quant_step_index];
scalefactor = ff_atrac_sf_table[sfIndx] * iMaxQuant[quant_step_index];
readQuantSpectralCoeffs(gb, quant_step_index, coding_mode, mantissa, coded_values);