[xiph-cvs] cvs commit: speex/libspeex filters.c filters.h nb_celp.c sb_celp.c

[Jean-Marc Valin]

jm          03/11/13 15:39:06

  Modified:    src      speexdec.c
               libspeex filters.c filters.h nb_celp.c sb_celp.c
  Log:
  spelling, cleanup

Revision  Changes    Path
1.84      +2 -2      speex/src/speexdec.c

Index: speexdec.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- speexdec.c	8 Oct 2003 05:03:48 -0000	1.83
+++ speexdec.c	13 Nov 2003 20:39:06 -0000	1.84
@@ -649,10 +649,10 @@
                   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)

<p><p>1.63      +1 -1      speex/libspeex/filters.c

Index: filters.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/filters.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- filters.c	12 Nov 2003 06:00:53 -0000	1.62
+++ filters.c	13 Nov 2003 20:39:06 -0000	1.63
@@ -442,7 +442,7 @@
 
 
 
-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;

<p><p>1.32      +1 -1      speex/libspeex/filters.h

Index: filters.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/filters.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- filters.h	12 Nov 2003 06:00:53 -0000	1.31
+++ filters.h	13 Nov 2003 20:39:06 -0000	1.32
@@ -72,7 +72,7 @@
 
 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*/

<p><p>1.151     +1 -1      speex/libspeex/nb_celp.c

Index: nb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/nb_celp.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- nb_celp.c	12 Nov 2003 07:30:18 -0000	1.150
+++ nb_celp.c	13 Nov 2003 20:39:06 -0000	1.151
@@ -968,7 +968,7 @@
    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;

<p><p>1.150     +1 -4      speex/libspeex/sb_celp.c

Index: sb_celp.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/sb_celp.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- sb_celp.c	13 Nov 2003 08:47:40 -0000	1.149
+++ sb_celp.c	13 Nov 2003 20:39:06 -0000	1.150
@@ -601,11 +601,8 @@
          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;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.