Changeset 3011:7b2d74e17603 in roaraudio

Timestamp:

10/28/09 18:34:21 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed bug reported by Simon Matter

File:

• libroardsp/filter_speex_prep.c (modified) (5 diffs)

libroardsp/filter_speex_prep.c

@@ -57 +57 @@
  memset(self, 0, sizeof(struct roardsp_speex_prep));
 
+ filter->inst = self;
+
  return 0;
 }
@@ -104 +106 @@
      return -1;
 
+    ROAR_DBG("roardsp_speex_prep_ctl(*): val->i32 = 0x%.8x", val->i32);
+    ROAR_DBG("roardsp_speex_prep_ctl(*): _CBVM(ROARDSP_SPEEX_PREP_DENOISE) = 0x%.8x", _CBVM(ROARDSP_SPEEX_PREP_DENOISE));
+
     if ( val->i32 & _CBVM(ROARDSP_SPEEX_PREP_DENOISE) ) {
-     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_DENOISE);
+     ROAR_DBG("roardsp_speex_prep_ctl(*): ROARDSP_SPEEX_PREP_CTB(ROARDSP_SPEEX_PREP_DENOISE, val->i32) = 0x%.8x", ROARDSP_SPEEX_PREP_CTB(ROARDSP_SPEEX_PREP_DENOISE, val->i32));
      switch (ROARDSP_SPEEX_PREP_CTB(ROARDSP_SPEEX_PREP_DENOISE, val->i32)) {
       case ROARDSP_SPEEX_PREP_ON:  si = _on;  break;
@@ -112 +117 @@
      }
      speex_preprocess_ctl(self->preprocess, SPEEX_PREPROCESS_SET_DENOISE, &si);
+     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_DENOISE);
     }
 
     if ( val->i32 & _CBVM(ROARDSP_SPEEX_PREP_AGC) ) {
-     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_AGC);
      switch (ROARDSP_SPEEX_PREP_CTB(ROARDSP_SPEEX_PREP_DENOISE, val->i32)) {
       case ROARDSP_SPEEX_PREP_ON:  si = _on;  break;
@@ -122 +127 @@
      }
      speex_preprocess_ctl(self->preprocess, SPEEX_PREPROCESS_SET_AGC, &si);
+     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_AGC);
     }
 
     if ( val->i32 & _CBVM(ROARDSP_SPEEX_PREP_VAD) ) {
-     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_VAD);
      switch (ROARDSP_SPEEX_PREP_CTB(ROARDSP_SPEEX_PREP_DENOISE, val->i32)) {
       case ROARDSP_SPEEX_PREP_ON:  si = _on;  break;
@@ -132 +137 @@
      }
      speex_preprocess_ctl(self->preprocess, SPEEX_PREPROCESS_SET_VAD, &si);
+     val->i32 -= val->i32 & _CBVM(ROARDSP_SPEEX_PREP_VAD);
     }