RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Give the context variables of ra288 a better name: s/glob/ractx/ 

Originally committed as revision 14414 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-07-26 14:31:47 +00:00
parent 029e1c01b5
commit 952a980d75
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libavcodec/ra288.c
View File

@ -49,19 +49,19 @@ static inline float scalar_product_float(const float * v1, const float * v2,
} }
/* Decode and produce output */ /* Decode and produce output */
static void decode(RA288Context *glob, float gain, int cb_coef) static void decode(RA288Context *ractx, float gain, int cb_coef)
{ {
int x, y; int x, y;
double sumsum; double sumsum;
float sum, buffer[5]; float sum, buffer[5];
memmove(glob->sb + 5, glob->sb, 36 * sizeof(*glob->sb)); memmove(ractx->sb + 5, ractx->sb, 36 * sizeof(*ractx->sb));
for (x=4; x >= 0; x--) for (x=4; x >= 0; x--)
glob->sb[x] = -scalar_product_float(glob->sb + x + 1, glob->pr1, 36); ractx->sb[x] = -scalar_product_float(ractx->sb + x + 1, ractx->pr1, 36);
/* convert log and do rms */ /* convert log and do rms */
sum = 32. - scalar_product_float(glob->pr2, glob->lhist, 10); sum = 32. - scalar_product_float(ractx->pr2, ractx->lhist, 10);
sum = av_clipf(sum, 0, 60); sum = av_clipf(sum, 0, 60);
@ -75,18 +75,18 @@ static void decode(RA288Context *glob, float gain, int cb_coef)
sum = FFMAX(sum, 1); sum = FFMAX(sum, 1);
/* shift and store */ /* shift and store */
memmove(glob->lhist, glob->lhist - 1, 10 * sizeof(*glob->lhist)); memmove(ractx->lhist, ractx->lhist - 1, 10 * sizeof(*ractx->lhist));
*glob->lhist = glob->history[glob->phase] = 10 * log10(sum) - 32; *ractx->lhist = ractx->history[ractx->phase] = 10 * log10(sum) - 32;
for (x=1; x < 5; x++) for (x=1; x < 5; x++)
for (y=x-1; y >= 0; y--) for (y=x-1; y >= 0; y--)
buffer[x] -= glob->pr1[x-y-1] * buffer[y]; buffer[x] -= ractx->pr1[x-y-1] * buffer[y];
/* output */ /* output */
for (x=0; x < 5; x++) { for (x=0; x < 5; x++) {
glob->output[glob->phase*5+x] = glob->sb[4-x] = ractx->output[ractx->phase*5+x] = ractx->sb[4-x] =
av_clipf(glob->sb[4-x] + buffer[x], -4095, 4095); av_clipf(ractx->sb[4-x] + buffer[x], -4095, 4095);
} }
} }
@ -187,28 +187,28 @@ static void do_hybrid_window(int order, int n, int non_rec, const float *in,
/** /**
* Backward synthesis filter. Find the LPC coefficients from past speech data. * Backward synthesis filter. Find the LPC coefficients from past speech data.
*/ */
static void backward_filter(RA288Context *glob) static void backward_filter(RA288Context *ractx)
{ {
float buffer1[40], temp1[37]; float buffer1[40], temp1[37];
float buffer2[8], temp2[11]; float buffer2[8], temp2[11];
memcpy(buffer1 , glob->output + 20, 20*sizeof(*buffer1)); memcpy(buffer1 , ractx->output + 20, 20*sizeof(*buffer1));
memcpy(buffer1 + 20, glob->output , 20*sizeof(*buffer1)); memcpy(buffer1 + 20, ractx->output , 20*sizeof(*buffer1));
do_hybrid_window(36, 40, 35, buffer1, temp1, glob->st1a, glob->st1b, do_hybrid_window(36, 40, 35, buffer1, temp1, ractx->st1a, ractx->st1b,
syn_window); syn_window);
if (!eval_lpc_coeffs(temp1, glob->st1, 36)) if (!eval_lpc_coeffs(temp1, ractx->st1, 36))
colmult(glob->pr1, glob->st1, syn_bw_tab, 36); colmult(ractx->pr1, ractx->st1, syn_bw_tab, 36);
memcpy(buffer2 , glob->history + 4, 4*sizeof(*buffer2)); memcpy(buffer2 , ractx->history + 4, 4*sizeof(*buffer2));
memcpy(buffer2 + 4, glob->history , 4*sizeof(*buffer2)); memcpy(buffer2 + 4, ractx->history , 4*sizeof(*buffer2));
do_hybrid_window(10, 8, 20, buffer2, temp2, glob->st2a, glob->st2b, do_hybrid_window(10, 8, 20, buffer2, temp2, ractx->st2a, ractx->st2b,
gain_window); gain_window);
if (!eval_lpc_coeffs(temp2, glob->st2, 10)) if (!eval_lpc_coeffs(temp2, ractx->st2, 10))
colmult(glob->pr2, glob->st2, gain_bw_tab, 10); colmult(ractx->pr2, ractx->st2, gain_bw_tab, 10);
} }
/* Decode a block (celp) */ /* Decode a block (celp) */
@ -218,7 +218,7 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
{ {
int16_t *out = data; int16_t *out = data;
int x, y; int x, y;
RA288Context *glob = avctx->priv_data; RA288Context *ractx = avctx->priv_data;
GetBitContext gb; GetBitContext gb;
if (buf_size < avctx->block_align) { if (buf_size < avctx->block_align) {
@ -233,14 +233,14 @@ static int ra288_decode_frame(AVCodecContext * avctx, void *data,
for (x=0; x < 32; x++) { for (x=0; x < 32; x++) {
float gain = amptable[get_bits(&gb, 3)]; float gain = amptable[get_bits(&gb, 3)];
int cb_coef = get_bits(&gb, 6 + (x&1)); int cb_coef = get_bits(&gb, 6 + (x&1));
glob->phase = x & 7; ractx->phase = x & 7;
decode(glob, gain, cb_coef); decode(ractx, gain, cb_coef);
for (y=0; y < 5; y++) for (y=0; y < 5; y++)
*(out++) = 8 * glob->output[glob->phase*5 + y]; *(out++) = 8 * ractx->output[ractx->phase*5 + y];
if (glob->phase == 3) if (ractx->phase == 3)
backward_filter(glob); backward_filter(ractx);
} }
*data_size = (char *)out - (char *)data; *data_size = (char *)out - (char *)data;