comparison aacsbr.c @ 11848:6b52f0c3263d libavcodec

10l: Fix types and now unused variables after last commit.
author alexc
date Mon, 07 Jun 2010 22:55:58 +0000
parents 67206bbbab10
children f2c42ef01008
comparison
equal deleted inserted replaced
11847:67206bbbab10 11848:6b52f0c3263d
82 #define SBR_VLC_ROW(name) \ 82 #define SBR_VLC_ROW(name) \
83 { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) } 83 { name ## _codes, name ## _bits, sizeof(name ## _codes), sizeof(name ## _codes[0]) }
84 84
85 av_cold void ff_aac_sbr_init(void) 85 av_cold void ff_aac_sbr_init(void)
86 { 86 {
87 int n, k; 87 int n;
88 static const struct { 88 static const struct {
89 const void *sbr_codes, *sbr_bits; 89 const void *sbr_codes, *sbr_bits;
90 const unsigned int table_size, elem_size; 90 const unsigned int table_size, elem_size;
91 } sbr_tmp[] = { 91 } sbr_tmp[] = {
92 SBR_VLC_ROW(t_huffman_env_1_5dB), 92 SBR_VLC_ROW(t_huffman_env_1_5dB),
1124 * Analysis QMF Bank (14496-3 sp04 p206) 1124 * Analysis QMF Bank (14496-3 sp04 p206)
1125 * 1125 *
1126 * @param x pointer to the beginning of the first sample window 1126 * @param x pointer to the beginning of the first sample window
1127 * @param W array of complex-valued samples split into subbands 1127 * @param W array of complex-valued samples split into subbands
1128 */ 1128 */
1129 static void sbr_qmf_analysis(DSPContext *dsp, RDFTContext *mdct, const float *in, float *x, 1129 static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x,
1130 float z[320], float W[2][32][32][2], 1130 float z[320], float W[2][32][32][2],
1131 float scale) 1131 float scale)
1132 { 1132 {
1133 int i, k; 1133 int i, k;
1134 memcpy(W[0], W[1], sizeof(W[0])); 1134 memcpy(W[0], W[1], sizeof(W[0]));
1137 dsp->vector_fmul_scalar(x+288, in, scale, 1024); 1137 dsp->vector_fmul_scalar(x+288, in, scale, 1024);
1138 else 1138 else
1139 memcpy(x+288, in, 1024*sizeof(*x)); 1139 memcpy(x+288, in, 1024*sizeof(*x));
1140 for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames 1140 for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames
1141 // are not supported 1141 // are not supported
1142 float re, im;
1143 dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320); 1142 dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320);
1144 for (k = 0; k < 64; k++) { 1143 for (k = 0; k < 64; k++) {
1145 float f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256]; 1144 float f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256];
1146 z[k] = f; 1145 z[k] = f;
1147 } 1146 }