diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-11-06 13:31:17 +0000 |
---|---|---|
committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-11-06 13:31:17 +0000 |
commit | c5cb9c946bb2b27ddd1284d2c66e0c3b20e77763 (patch) | |
tree | 40e1b9f629e8be72301fd50b72038fef60fda98e /libavcodec/truespeech.c | |
parent | 8600bbb301cd45c981969813b46c397191aaddf4 (diff) | |
download | ffmpeg-c5cb9c946bb2b27ddd1284d2c66e0c3b20e77763.tar.gz |
try to give TrueSpeech decoder tables more sensible names
Originally committed as revision 25681 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/truespeech.c')
-rw-r--r-- | libavcodec/truespeech.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index eafbca52d8..807329ee11 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -165,7 +165,7 @@ static void truespeech_correlate_filter(TSContext *dec) dec->cvector[i] = (8 - dec->vector[i]) >> 3; } for(i = 0; i < 8; i++) - dec->cvector[i] = (dec->cvector[i] * ts_230[i]) >> 15; + dec->cvector[i] = (dec->cvector[i] * ts_decay_994_1000[i]) >> 15; dec->filtval = dec->vector[0]; } @@ -207,7 +207,7 @@ static void truespeech_apply_twopoint_filter(TSContext *dec, int quart) off = (t / 25) + dec->offset1[quart >> 1] + 18; ptr0 = tmp + 145 - off; ptr1 = tmp + 146; - filter = (const int16_t*)ts_240 + (t % 25) * 2; + filter = (const int16_t*)ts_order2_coeffs + (t % 25) * 2; for(i = 0; i < 60; i++){ t = (ptr0[0] * filter[0] + ptr0[1] * filter[1] + 0x2000) >> 14; ptr0++; @@ -228,11 +228,11 @@ static void truespeech_place_pulses(TSContext *dec, int16_t *out, int quart) for(i = 0; i < 7; i++) { t = dec->pulseval[quart] & 3; dec->pulseval[quart] >>= 2; - tmp[6 - i] = ts_562[dec->pulseoff[quart] * 4 + t]; + tmp[6 - i] = ts_pulse_scales[dec->pulseoff[quart] * 4 + t]; } coef = dec->pulsepos[quart] >> 15; - ptr1 = (const int16_t*)ts_140 + 30; + ptr1 = (const int16_t*)ts_pulse_values + 30; ptr2 = tmp; for(i = 0, j = 3; (i < 30) && (j > 0); i++){ t = *ptr1++; @@ -245,7 +245,7 @@ static void truespeech_place_pulses(TSContext *dec, int16_t *out, int quart) } } coef = dec->pulsepos[quart] & 0x7FFF; - ptr1 = (const int16_t*)ts_140; + ptr1 = (const int16_t*)ts_pulse_values; for(i = 30, j = 4; (i < 60) && (j > 0); i++){ t = *ptr1++; if(coef >= t) @@ -291,7 +291,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) } for(i = 0; i < 8; i++) - t[i] = (ts_5E2[i] * ptr1[i]) >> 15; + t[i] = (ts_decay_35_64[i] * ptr1[i]) >> 15; ptr0 = dec->tmp2; for(i = 0; i < 60; i++){ @@ -305,7 +305,7 @@ static void truespeech_synth(TSContext *dec, int16_t *out, int quart) } for(i = 0; i < 8; i++) - t[i] = (ts_5F2[i] * ptr1[i]) >> 15; + t[i] = (ts_decay_3_4[i] * ptr1[i]) >> 15; ptr0 = dec->tmp3; for(i = 0; i < 60; i++){ |