[xiph-commits] r13764 - trunk/ghost/libghost

[jm at svn.xiph.org]

Author: jm
Date: 2007-09-06 03:22:53 -0700 (Thu, 06 Sep 2007)
New Revision: 13764

Modified:
   trunk/ghost/libghost/ceft.c
   trunk/ghost/libghost/ghost.c
Log:
Enabling CEFT by default -- for now. Oh, and fixed the pitch predictor.


Modified: trunk/ghost/libghost/ceft.c
===================================================================
--- trunk/ghost/libghost/ceft.c	2007-09-06 01:33:29 UTC (rev 13763)
+++ trunk/ghost/libghost/ceft.c	2007-09-06 10:22:53 UTC (rev 13764)
@@ -496,9 +496,8 @@
 
       gains[i] = gain;
    }
-   for (i=pbank[PBANDS];i<256;i++)
+   for (i=pbank[PBANDS]*2-1;i<256;i++)
       P[i] = 0;
-   P[255] = 0;
    /*if (rand()%10 == 0)
    {
       for (i=0;i<PBANDS;i++)
@@ -520,9 +519,8 @@
       }
       //printf ("%f ", gain);
    }
-   for (i=pbank[PBANDS];i<256;i++)
+   for (i=pbank[PBANDS]*2-1;i<256;i++)
       P[i] = 0;
-   P[255] = 0;
 }
 
 

Modified: trunk/ghost/libghost/ghost.c
===================================================================
--- trunk/ghost/libghost/ghost.c	2007-09-06 01:33:29 UTC (rev 13763)
+++ trunk/ghost/libghost/ghost.c	2007-09-06 10:22:53 UTC (rev 13764)
@@ -31,10 +31,10 @@
 #include "fftwrap.h"
 #include "filterbank.h"
 
-#define PCM_BUF_SIZE 2048
+#define PCM_BUF_SIZE 512
 #define PITCH_BUF_SIZE 1024
 
-#define SINUSOIDS 30
+#define SINUSOIDS 0
 #define MASK_LPC_ORDER 10
 void fir_mem2(const spx_sig_t *x, const spx_coef_t *num, spx_sig_t *y, int N, int ord, spx_mem_t *mem)
 {
@@ -149,7 +149,7 @@
    st->adpcm = adpcm_init(8);
    st->ceft = ceft_init(st->length);
 
-   st->preemph = .0;
+   st->preemph = .8;
    st->preemph_mem = 0;
    st->deemph_mem = 0;
    
@@ -228,7 +228,7 @@
       printf ("\n");*/
       /*for (i=0;i<st->length;i++)
       y[i] *= st->synthesis_window[i];*/
-#if 0
+#if 1
       int pitch_index=0;
       float curve2[512];
       for (i=0;i<512;i++)