comparison ra288.c @ 7848:f29ec8e5d186 libavcodec

Rename function: s/colmult/apply_window/
author vitor
date Thu, 11 Sep 2008 19:06:54 +0000
parents 5a114f24632a
children 2bfde5b45e01
comparison
equal deleted inserted replaced
7847:5a114f24632a 7848:f29ec8e5d186
58 res += *v1++ * *v2++; 58 res += *v1++ * *v2++;
59 59
60 return res; 60 return res;
61 } 61 }
62 62
63 static void colmult(float *tgt, const float *m1, const float *m2, int n) 63 static void apply_window(float *tgt, const float *m1, const float *m2, int n)
64 { 64 {
65 while (n--) 65 while (n--)
66 *tgt++ = *m1++ * *m2++; 66 *tgt++ = *m1++ * *m2++;
67 } 67 }
68 68
146 146
147 /* update history */ 147 /* update history */
148 memmove(hist , hist + n, (order + non_rec)*sizeof(*hist)); 148 memmove(hist , hist + n, (order + non_rec)*sizeof(*hist));
149 memcpy (hist + order + non_rec, in , n *sizeof(*hist)); 149 memcpy (hist + order + non_rec, in , n *sizeof(*hist));
150 150
151 colmult(work, window, hist, order + n + non_rec); 151 apply_window(work, window, hist, order + n + non_rec);
152 152
153 convolve(buffer1, work + order , n , order); 153 convolve(buffer1, work + order , n , order);
154 convolve(buffer2, work + order + n, non_rec, order); 154 convolve(buffer2, work + order + n, non_rec, order);
155 155
156 for (i=0; i <= order; i++) { 156 for (i=0; i <= order; i++) {
172 172
173 do_hybrid_window(36, 40, 35, ractx->sp_block+1, temp1, ractx->sp_hist, 173 do_hybrid_window(36, 40, 35, ractx->sp_block+1, temp1, ractx->sp_hist,
174 ractx->sp_rec, syn_window); 174 ractx->sp_rec, syn_window);
175 175
176 if (!compute_lpc_coefs(temp1, 36, ractx->sp_lpc, 0, 1, 1)) 176 if (!compute_lpc_coefs(temp1, 36, ractx->sp_lpc, 0, 1, 1))
177 colmult(ractx->sp_lpc, ractx->sp_lpc, syn_bw_tab, 36); 177 apply_window(ractx->sp_lpc, ractx->sp_lpc, syn_bw_tab, 36);
178 178
179 do_hybrid_window(10, 8, 20, ractx->gain_block+2, temp2, ractx->gain_hist, 179 do_hybrid_window(10, 8, 20, ractx->gain_block+2, temp2, ractx->gain_hist,
180 ractx->gain_rec, gain_window); 180 ractx->gain_rec, gain_window);
181 181
182 if (!compute_lpc_coefs(temp2, 10, ractx->gain_lpc, 0, 1, 1)) 182 if (!compute_lpc_coefs(temp2, 10, ractx->gain_lpc, 0, 1, 1))
183 colmult(ractx->gain_lpc, ractx->gain_lpc, gain_bw_tab, 10); 183 apply_window(ractx->gain_lpc, ractx->gain_lpc, gain_bw_tab, 10);
184 } 184 }
185 185
186 static int ra288_decode_frame(AVCodecContext * avctx, void *data, 186 static int ra288_decode_frame(AVCodecContext * avctx, void *data,
187 int *data_size, const uint8_t * buf, 187 int *data_size, const uint8_t * buf,
188 int buf_size) 188 int buf_size)