From: Andre Noll Date: Thu, 22 Oct 2009 22:10:04 +0000 (+0200) Subject: skip pointless ff_ prefix. X-Git-Tag: v0.4.1~37 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=21de835df6d0762c8d7b6dab439257e7fe8a70e6 skip pointless ff_ prefix. --- diff --git a/imdct.c b/imdct.c index f77da7bb..8bb52d95 100644 --- a/imdct.c +++ b/imdct.c @@ -52,7 +52,7 @@ struct mdct_context { }; /** cos(2 * pi * x / n) for 0 <= x <= n / 4, followed by its reverse */ -#define COSINE_TAB(n) fftsample_t ff_cos_ ## n[n / 2] __aligned(16) +#define COSINE_TAB(n) fftsample_t cos_ ## n[n / 2] __aligned(16) COSINE_TAB(16); COSINE_TAB(32); @@ -68,10 +68,9 @@ COSINE_TAB(16384); COSINE_TAB(32768); COSINE_TAB(65536); -static fftsample_t *ff_cos_tabs[] = { - ff_cos_16, ff_cos_32, ff_cos_64, ff_cos_128, ff_cos_256, - ff_cos_512, ff_cos_1024, ff_cos_2048, ff_cos_4096, ff_cos_8192, - ff_cos_16384, ff_cos_32768, ff_cos_65536, +static fftsample_t *cos_tabs[] = { + cos_16, cos_32, cos_64, cos_128, cos_256, cos_512, cos_1024, cos_2048, + cos_4096, cos_8192, cos_16384, cos_32768, cos_65536, }; static int split_radix_permutation(int i, int n) @@ -167,7 +166,7 @@ static void fft##n(struct fft_complex *z)\ fft##n2(z);\ fft##n4(z+n4*2);\ fft##n4(z+n4*3);\ - pass(z,ff_cos_##n,n4/2);\ + pass(z,cos_##n,n4/2);\ } static void fft4(struct fft_complex *z) { @@ -213,8 +212,8 @@ static void fft16(struct fft_complex *z) TRANSFORM_ZERO(z[0], z[4], z[8], z[12]); TRANSFORM(z[2], z[6], z[10], z[14], SQRTHALF, SQRTHALF); - TRANSFORM(z[1], z[5], z[9], z[13], ff_cos_16[1], ff_cos_16[3]); - TRANSFORM(z[3], z[7], z[11], z[15], ff_cos_16[3], ff_cos_16[1]); + TRANSFORM(z[1], z[5], z[9], z[13], cos_16[1], cos_16[3]); + TRANSFORM(z[3], z[7], z[11], z[15], cos_16[3], cos_16[1]); } DECL_FFT(32, 16, 8) @@ -338,7 +337,7 @@ static int fft_init(struct fft_context *s, int nbits) for (j = 4; j <= nbits; j++) { int k = 1 << j; double freq = 2 * M_PI / k; - fftsample_t *tab = ff_cos_tabs[j - 4]; + fftsample_t *tab = cos_tabs[j - 4]; for (i = 0; i <= k / 4; i++) tab[i] = cos(i * freq); for (i = 1; i < k / 4; i++) diff --git a/wmadata.h b/wmadata.h index 1dfa45de..13fe7ad8 100644 --- a/wmadata.h +++ b/wmadata.h @@ -63,7 +63,7 @@ static const uint8_t exponent_band_44100[3][25] = { {17, 4, 8, 8, 4, 12, 12, 8, 8, 24, 16, 20, 24, 32, 40, 60, 80, 152,}, }; -const uint16_t ff_wma_hgain_huffcodes[37] = { +const uint16_t wma_hgain_huffcodes[37] = { 0x00003, 0x002e7, 0x00001, 0x005cd, 0x0005d, 0x005c9, 0x0005e, 0x00003, 0x00016, 0x0000b, 0x00001, 0x00006, 0x00001, 0x00006, 0x00004, 0x00005, 0x00004, 0x00007, 0x00003, 0x00007, 0x00004, 0x0000a, 0x0000a, 0x00002, @@ -71,7 +71,7 @@ const uint16_t ff_wma_hgain_huffcodes[37] = { 0x005c8, 0x000b8, 0x005ca, 0x005cb, 0x005cc, }; -const uint8_t ff_wma_hgain_huffbits[37] = { +const uint8_t wma_hgain_huffbits[37] = { 10, 12, 10, 13, 9, 13, 9, 8, 7, 5, 5, 4, 4, 3, 3, 3, 4, 3, 4, 4, 5, 5, 6, 8, @@ -81,7 +81,7 @@ const uint8_t ff_wma_hgain_huffbits[37] = { #define NB_LSP_COEFS 10 -const float ff_wma_lsp_codebook[NB_LSP_COEFS][16] = { +const float wma_lsp_codebook[NB_LSP_COEFS][16] = { {1.98732877, 1.97944528, 1.97179088, 1.96260549, 1.95038374, 1.93336114, 1.90719232, 1.86191415,}, {1.97260000, 1.96083160, 1.94982586, 1.93806164, 1.92516608, 1.91010199, @@ -118,7 +118,7 @@ const float ff_wma_lsp_codebook[NB_LSP_COEFS][16] = { -1.86220079, -1.90283983, -1.94820479,}, }; -const uint32_t ff_wma_scale_huffcodes[121] = { +const uint32_t wma_scale_huffcodes[121] = { 0x3ffe8, 0x3ffe6, 0x3ffe7, 0x3ffe5, 0x7fff5, 0x7fff1, 0x7ffed, 0x7fff6, 0x7ffee, 0x7ffef, 0x7fff0, 0x7fffc, 0x7fffd, 0x7ffff, 0x7fffe, 0x7fff7, 0x7fff8, 0x7fffb, 0x7fff9, 0x3ffe4, 0x7fffa, 0x3ffe3, 0x1ffef, 0x1fff0, @@ -137,7 +137,7 @@ const uint32_t ff_wma_scale_huffcodes[121] = { 0x7fff3, }; -const uint8_t ff_wma_scale_huffbits[121] = { +const uint8_t wma_scale_huffbits[121] = { 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 18, 19, 18, 17, 17, diff --git a/wmadec_filter.c b/wmadec_filter.c index d40cc3eb..16b9894c 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -131,7 +131,7 @@ struct private_wmadec_data { #define VLCBITS 9 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS) -#define SINE_WINDOW(x) float ff_sine_ ## x[x] __aligned(16) +#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16) SINE_WINDOW(128); SINE_WINDOW(256); @@ -140,9 +140,8 @@ SINE_WINDOW(1024); SINE_WINDOW(2048); SINE_WINDOW(4096); -static float *ff_sine_windows[6] = { - ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024, - ff_sine_2048, ff_sine_4096 +static float *sine_windows[6] = { + sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096 }; /* Generate a sine window. */ @@ -385,8 +384,8 @@ static int wma_init(struct private_wmadec_data *pwd) for (i = 0; i < pwd->nb_block_sizes; i++) { int n; n = 1 << (pwd->frame_len_bits - i); - sine_window_init(ff_sine_windows[pwd->frame_len_bits - i - 7], n); - pwd->windows[i] = ff_sine_windows[pwd->frame_len_bits - i - 7]; + sine_window_init(sine_windows[pwd->frame_len_bits - i - 7], n); + pwd->windows[i] = sine_windows[pwd->frame_len_bits - i - 7]; } pwd->reset_block_lengths = 1; @@ -483,15 +482,15 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat if (pwd->use_noise_coding) { PARA_INFO_LOG("using noise coding\n"); init_vlc(&pwd->hgain_vlc, HGAINVLCBITS, - sizeof(ff_wma_hgain_huffbits), ff_wma_hgain_huffbits, - ff_wma_hgain_huffcodes, 2); + sizeof(wma_hgain_huffbits), wma_hgain_huffbits, + wma_hgain_huffcodes, 2); } if (pwd->use_exp_vlc) { PARA_INFO_LOG("using exp_vlc\n"); init_vlc(&pwd->exp_vlc, EXPVLCBITS, - sizeof(ff_wma_scale_huffbits), ff_wma_scale_huffbits, - ff_wma_scale_huffcodes, 4); + sizeof(wma_scale_huffbits), wma_scale_huffbits, + wma_scale_huffcodes, 4); } else { PARA_INFO_LOG("using curve\n"); wma_lsp_to_curve_init(pwd, pwd->frame_len); @@ -562,7 +561,7 @@ static void decode_exp_lsp(struct private_wmadec_data *pwd, int ch) val = get_bits(&pwd->gb, 3); else val = get_bits(&pwd->gb, 4); - lsp_coefs[i] = ff_wma_lsp_codebook[i][val]; + lsp_coefs[i] = wma_lsp_codebook[i][val]; } wma_lsp_to_curve(pwd, pwd->exponents[ch], &pwd->max_exponent[ch],