cmProc2.h:Finished 'bump' mode.

This commit is contained in:
kevin 2013-05-24 15:07:38 -07:00
parent 7f086d4365
commit 1c3717e3a8
2 changed files with 4 additions and 2 deletions

View File

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

View File

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