changeset 7430:4ebfb53ff2df libavcodec

Remove the history buffer from the context. It can easily be evaluated from the lhist buffer.
author vitor
date Sun, 27 Jul 2008 22:21:41 +0000
parents 6c2cbc2a8e96
children da24b77f46f6
files ra288.c
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ra288.c	Sun Jul 27 21:56:26 2008 +0000
+++ b/ra288.c	Sun Jul 27 22:21:41 2008 +0000
@@ -25,7 +25,6 @@
 #include "ra288.h"
 
 typedef struct {
-    float history[8];
     float output[40];
     float sp_lpc[36];   ///< LPC coefficients for speech data (spec: A)
     float gain_lpc[10]; ///< LPC coefficients for gain (spec: GB)
@@ -92,7 +91,7 @@
     /* shift and store */
     memmove(ractx->lhist, ractx->lhist - 1, 10 * sizeof(*ractx->lhist));
 
-    *ractx->lhist = ractx->history[ractx->phase] = 10 * log10(sum) - 32;
+    *ractx->lhist = 10 * log10(sum) - 32;
 
     for (x=1; x < 5; x++)
         for (y=x-1; y >= 0; y--)
@@ -198,6 +197,11 @@
 {
     float temp1[37]; // RTMP in the spec
     float temp2[11]; // GPTPMP in the spec
+    float history[8];
+    int i;
+
+    for (i=0 ; i < 8; i++)
+        history[i] = ractx->lhist[7-i];
 
     do_hybrid_window(36, 40, 35, ractx->output, temp1, ractx->sp_hist,
                      ractx->sp_rec, syn_window);
@@ -205,7 +209,7 @@
     if (!eval_lpc_coeffs(temp1, ractx->sp_lpc, 36))
         colmult(ractx->sp_lpc, ractx->sp_lpc, syn_bw_tab, 36);
 
-    do_hybrid_window(10, 8, 20, ractx->history, temp2, ractx->gain_hist,
+    do_hybrid_window(10, 8, 20, history, temp2, ractx->gain_hist,
                      ractx->gain_rec, gain_window);
 
     if (!eval_lpc_coeffs(temp2, ractx->gain_lpc, 10))