spelling, cleanup
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Thu, 13 Nov 2003 20:39:06 +0000 (20:39 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Thu, 13 Nov 2003 20:39:06 +0000 (20:39 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@5573 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/filters.c
libspeex/filters.h
libspeex/nb_celp.c
libspeex/sb_celp.c
src/speexdec.c

index 829f513..28b949f 100644 (file)
@@ -442,7 +442,7 @@ void fir_mem_up(spx_sig_t *x, spx_word16_t *a, spx_sig_t *y, int N, int M, spx_w
 
 
 
-void comp_filter_mem_init (CombFilterMem *mem)
+void comb_filter_mem_init (CombFilterMem *mem)
 {
    mem->last_pitch=0;
    mem->last_pitch_gain[0]=mem->last_pitch_gain[1]=mem->last_pitch_gain[2]=0;
index dc8eb18..cd858a6 100644 (file)
@@ -72,7 +72,7 @@ void syn_percep_zero(spx_sig_t *x, spx_coef_t *ak, spx_coef_t *awk1, spx_coef_t
 
 void residue_percep_zero(spx_sig_t *xx, spx_coef_t *ak, spx_coef_t *awk1, spx_coef_t *awk2, spx_sig_t *y, int N, int ord, char *stack);
 
-void comp_filter_mem_init (CombFilterMem *mem);
+void comb_filter_mem_init (CombFilterMem *mem);
 
 void comb_filter(
 spx_sig_t *exc,          /*decoded excitation*/
index ef57e2e..7e6102c 100644 (file)
@@ -968,7 +968,7 @@ void *nb_decoder_init(SpeexMode *m)
    st->interp_qlsp = PUSH(st->stack, st->lpcSize, spx_lsp_t);
    st->mem_sp = PUSH(st->stack, 5*st->lpcSize, spx_mem_t);
    st->comb_mem = PUSHS(st->stack, CombFilterMem);
-   comp_filter_mem_init (st->comb_mem);
+   comb_filter_mem_init (st->comb_mem);
 
    st->pi_gain = PUSH(st->stack, st->nbSubframes, float);
    st->last_pitch = 40;
index 1aea50f..2e9530d 100644 (file)
@@ -601,11 +601,8 @@ int sb_encode(void *state, short *in, SpeexBits *bits)
          if (st->subframeSize==80)
             gc *= 1.4142;
 
-#ifdef FIXED_POINT
          scale = SHL(MULT16_16(DIV32_16(SHL(gc,SIG_SHIFT-4),filter_ratio),(1+el)),4);
-#else
-         scale = gc*(1.+el)/filter_ratio;
-#endif
+
          for (i=0;i<st->subframeSize;i++)
             exc[i]=VERY_SMALL;
          exc[0]=SIG_SCALING;
index 7dc9a14..6b02126 100644 (file)
@@ -649,10 +649,10 @@ int main(int argc, char **argv)
                  if (strlen(outFile)!=0)
                   {
                      for (i=0;i<frame_size*channels;i++)
-                        out[i]=(short)le_short((short)floor(.5+output[i]));
+                        out[i]=le_short(output[i]);
                  } else {
                      for (i=0;i<frame_size*channels;i++)
-                        out[i]=(short)floor(.5+output[i]);
+                        out[i]=output[i];
                  }
 #if defined WIN32 || defined _WIN32
                   if (strlen(outFile)==0)