Browse Source

cmProc2.h:Finished 'bump' mode.

master
kevin 11 years ago
parent
commit
1c3717e3a8
2 changed files with 4 additions and 2 deletions
  1. 3
    2
      cmProc2.c
  2. 1
    0
      cmProc2.h

+ 3
- 2
cmProc2.c View File

@@ -3860,7 +3860,7 @@ void _cmSpecDistBump( cmSpecDist_t* p, cmReal_t* x, unsigned binCnt, double thre
3860 3860
   */
3861 3861
   unsigned i=0;
3862 3862
 
3863
-  printf("%f %f %f\n",thresh,p->lwrSlope,x[0]);
3863
+  //printf("%f %f %f\n",thresh,p->lwrSlope,x[0]);
3864 3864
   
3865 3865
   double minDb = -100.0;
3866 3866
   thresh = -thresh;
@@ -3958,8 +3958,9 @@ cmRC_t  cmSpecDistExec( cmSpecDist_t* p, const cmSample_t* sp, unsigned sn )
3958 3958
         }
3959 3959
         break;
3960 3960
 
3961
-      case 4:
3961
+      case kBumpSdId:
3962 3962
         _cmSpecDistBump(p,X1m, p->pva->binCnt, p->thresh);
3963
+        _cmSpecDistBasicMode(p,X1m,p->pva->binCnt,p->thresh);
3963 3964
         break;
3964 3965
 
3965 3966
       case 5:

+ 1
- 0
cmProc2.h View File

@@ -772,6 +772,7 @@ extern "C" {
772 772
     kBasicModeSdId,   // 1 - fixed thresh
773 773
     kSpecCentSdId,    // 2 - thresh = max magn - (offset * spec_cent)
774 774
     kAmpEnvSdId,      // 3 - thresh = max magn - offset
775
+    kBumpSdId,
775 776
     kModeSdCnt
776 777
   };
777 778
 

Loading…
Cancel
Save