[xiph-cvs] cvs commit: speex/libspeex speex_preprocess.h preprocess.c

[Jean-Marc Valin]

jm          03/09/17 21:08:12

  Modified:    libspeex speex_preprocess.h preprocess.c
  Log:
  cleanup

Revision  Changes    Path
1.8       +1 -5      speex/libspeex/speex_preprocess.h

Index: speex_preprocess.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/speex_preprocess.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- speex_preprocess.h	17 Sep 2003 04:12:13 -0000	1.7
+++ speex_preprocess.h	18 Sep 2003 01:08:12 -0000	1.8
@@ -58,14 +58,13 @@
    float *gain;              /**< Ephraim Malah gain */
    float *prior;             /**< A-priori SNR */
    float *post;              /**< A-posteriori SNR */
-   float *min_ps;            /**< */
 
    float *S;                 /**< Smoothed power spectrum */
    float *Smin;              /**< See Cohen paper */
    float *Stmp;              /**< See Cohen paper */
    float *update_prob;       /**< Propability of speech presence for noise update */
 
-   float *loudness_weight;   /**< */
+   float *loudness_weight;   /**< Perceptual loudness curve */
 
    float *echo_noise;
 
@@ -87,9 +86,6 @@
    int    nb_loudness_adapt; /**< Number of frames used for loudness adaptation so far */
    int    consec_noise;      /**< Number of consecutive noise frames */
    int    nb_preprocess;     /**< Number of frames processed so far */
-   int    nb_min_estimate;   /**< */
-   int    last_update;       /**< */
-   float  min_ener;          /**< */
    struct drft_lookup *fft_lookup;   /**< Lookup table for the FFT */
 
 } SpeexPreprocessState;

<p><p>1.10      +0 -6      speex/libspeex/preprocess.c

Index: preprocess.c
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/preprocess.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- preprocess.c	17 Sep 2003 21:31:34 -0000	1.9
+++ preprocess.c	18 Sep 2003 01:08:12 -0000	1.10
@@ -214,8 +214,6 @@
    st->nb_adapt=0;
    st->consec_noise=0;
    st->nb_preprocess=0;
-   st->nb_min_estimate=0;
-   st->last_update=0;
    return st;
 }
 
@@ -621,10 +619,8 @@
 
    /* Noise estimation always updated for the 20 first times */
    if (st->nb_adapt<10)
-      /*if (st->nb_adapt<25 && st->nb_adapt>15)*/
    {
       update_noise(st, ps, echo);
-      st->last_update=0;
    }
 
    /* Deal with residual echo if provided */
@@ -730,9 +726,7 @@
    if (st->consec_noise>=3)
    {
       update_noise(st, st->old_ps, echo);
-      st->last_update=0;
    } else {
-      st->last_update++;
       for (i=1;i<N-1;i++)
       {
          if (st->update_prob[i]<.5)

<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.