comparison ra288.c @ 7418:83d005a098b5 libavcodec

Rename st{1,2}{a,b} context variables to more meaningful names: {sp,gain}_{rec,hist}
author vitor
date Sat, 26 Jul 2008 15:10:17 +0000
parents a65363f8ab4b
children 175c2c4d6887
comparison
equal deleted inserted replaced
7417:5b281979b60e 7418:83d005a098b5
29 float output[40]; 29 float output[40];
30 float pr1[36]; 30 float pr1[36];
31 float pr2[10]; 31 float pr2[10];
32 int phase; 32 int phase;
33 33
34 float st1a[111], st1b[37], st1[37]; 34 float sp_hist[111]; ///< Speech data history (spec: SB)
35 float st2a[38], st2b[11], st2[11]; 35
36 /** Speech part of the gain autocorrelation (spec: REXP) */
37 float sp_rec[37];
38
39 float st1[37];
40 float gain_hist[38]; ///< Log-gain history (spec: SBLG)
41
42 /** Recursive part of the gain autocorrelation (spec: REXPLG) */
43 float gain_rec[11];
44
45 float st2[11];
36 float sb[41]; 46 float sb[41];
37 float lhist[10]; 47 float lhist[10];
38 } RA288Context; 48 } RA288Context;
39 49
40 static inline float scalar_product_float(const float * v1, const float * v2, 50 static inline float scalar_product_float(const float * v1, const float * v2,
191 float buffer2[8], temp2[11]; 201 float buffer2[8], temp2[11];
192 202
193 memcpy(buffer1 , ractx->output + 20, 20*sizeof(*buffer1)); 203 memcpy(buffer1 , ractx->output + 20, 20*sizeof(*buffer1));
194 memcpy(buffer1 + 20, ractx->output , 20*sizeof(*buffer1)); 204 memcpy(buffer1 + 20, ractx->output , 20*sizeof(*buffer1));
195 205
196 do_hybrid_window(36, 40, 35, buffer1, temp1, ractx->st1a, ractx->st1b, 206 do_hybrid_window(36, 40, 35, buffer1, temp1, ractx->sp_hist, ractx->sp_rec,
197 syn_window); 207 syn_window);
198 208
199 if (!eval_lpc_coeffs(temp1, ractx->st1, 36)) 209 if (!eval_lpc_coeffs(temp1, ractx->st1, 36))
200 colmult(ractx->pr1, ractx->st1, syn_bw_tab, 36); 210 colmult(ractx->pr1, ractx->st1, syn_bw_tab, 36);
201 211
202 memcpy(buffer2 , ractx->history + 4, 4*sizeof(*buffer2)); 212 memcpy(buffer2 , ractx->history + 4, 4*sizeof(*buffer2));
203 memcpy(buffer2 + 4, ractx->history , 4*sizeof(*buffer2)); 213 memcpy(buffer2 + 4, ractx->history , 4*sizeof(*buffer2));
204 214
205 do_hybrid_window(10, 8, 20, buffer2, temp2, ractx->st2a, ractx->st2b, 215 do_hybrid_window(10, 8, 20, buffer2, temp2, ractx->gain_hist, ractx->gain_rec,
206 gain_window); 216 gain_window);
207 217
208 if (!eval_lpc_coeffs(temp2, ractx->st2, 10)) 218 if (!eval_lpc_coeffs(temp2, ractx->st2, 10))
209 colmult(ractx->pr2, ractx->st2, gain_bw_tab, 10); 219 colmult(ractx->pr2, ractx->st2, gain_bw_tab, 10);
210 } 220 }