|
@@ -5499,8 +5499,8 @@ cmSpecDist_t* cmSpecDistAlloc( cmCtx* ctx,cmSpecDist_t* ap, unsigned procSmpCnt,
|
5499
|
5499
|
{
|
5500
|
5500
|
cmSpecDist_t* p = cmObjAlloc( cmSpecDist_t, ctx, ap );
|
5501
|
5501
|
|
5502
|
|
- p->iSpecVa = cmVectArrayAlloc(ctx,kRealVaFl);
|
5503
|
|
- p->oSpecVa = cmVectArrayAlloc(ctx,kRealVaFl);
|
|
5502
|
+ //p->iSpecVa = cmVectArrayAlloc(ctx,kRealVaFl);
|
|
5503
|
+ //p->oSpecVa = cmVectArrayAlloc(ctx,kRealVaFl);
|
5504
|
5504
|
|
5505
|
5505
|
if( procSmpCnt != 0 )
|
5506
|
5506
|
{
|
|
@@ -5520,8 +5520,8 @@ cmRC_t cmSpecDistFree( cmSpecDist_t** pp )
|
5520
|
5520
|
cmSpecDist_t* p = *pp;
|
5521
|
5521
|
|
5522
|
5522
|
cmSpecDistFinal(p);
|
5523
|
|
- cmVectArrayFree(&p->iSpecVa);
|
5524
|
|
- cmVectArrayFree(&p->oSpecVa);
|
|
5523
|
+ //cmVectArrayFree(&p->iSpecVa);
|
|
5524
|
+ //cmVectArrayFree(&p->oSpecVa);
|
5525
|
5525
|
cmMemPtrFree(&p->hzV);
|
5526
|
5526
|
cmMemPtrFree(&p->iSpecM);
|
5527
|
5527
|
cmMemPtrFree(&p->oSpecM);
|
|
@@ -5581,8 +5581,7 @@ cmRC_t cmSpecDistInit( cmSpecDist_t* p, unsigned procSmpCnt, double srate, unsig
|
5581
|
5581
|
fta.specFn = "/home/kevin/temp/frqtrk/spec.va";
|
5582
|
5582
|
fta.attenFn = "/home/kevin/temp/frqtrk/atten.va";
|
5583
|
5583
|
|
5584
|
|
- p->ft = cmFrqTrkAlloc( p->obj.ctx, NULL, &fta );
|
5585
|
|
- //cmFrqTrkPrint(p->ft);
|
|
5584
|
+ //p->ft = cmFrqTrkAlloc( p->obj.ctx, NULL, &fta );
|
5586
|
5585
|
|
5587
|
5586
|
cmFbCtlArgs_t fba;
|
5588
|
5587
|
fba.srate = srate;
|
|
@@ -5591,7 +5590,7 @@ cmRC_t cmSpecDistInit( cmSpecDist_t* p, unsigned procSmpCnt, double srate, unsig
|
5591
|
5590
|
fba.bufMs = 500;
|
5592
|
5591
|
fba.maxHz = 5000;
|
5593
|
5592
|
|
5594
|
|
- p->fbc = cmFbCtlAlloc( p->obj.ctx, NULL, &fba );
|
|
5593
|
+ //p->fbc = cmFbCtlAlloc( p->obj.ctx, NULL, &fba );
|
5595
|
5594
|
|
5596
|
5595
|
p->spcBwHz = cmMin(srate/2,10000);
|
5597
|
5596
|
p->spcSmArg = 0.05;
|
|
@@ -5628,13 +5627,13 @@ cmRC_t cmSpecDistFinal(cmSpecDist_t* p )
|
5628
|
5627
|
{
|
5629
|
5628
|
cmRC_t rc = cmOkRC;
|
5630
|
5629
|
|
5631
|
|
- cmVectArrayWrite(p->iSpecVa, "/home/kevin/temp/frqtrk/iSpec.va");
|
5632
|
|
- cmVectArrayWrite(p->oSpecVa, "/home/kevin/temp/frqtrk/oSpec.va");
|
|
5630
|
+ //cmVectArrayWrite(p->iSpecVa, "/home/kevin/temp/frqtrk/iSpec.va");
|
|
5631
|
+ //cmVectArrayWrite(p->oSpecVa, "/home/kevin/temp/frqtrk/oSpec.va");
|
5633
|
5632
|
|
5634
|
5633
|
cmPvAnlFree(&p->pva);
|
5635
|
5634
|
cmPvSynFree(&p->pvs);
|
5636
|
|
- cmFrqTrkFree(&p->ft);
|
5637
|
|
- cmFbCtlFree(&p->fbc);
|
|
5635
|
+ //cmFrqTrkFree(&p->ft);
|
|
5636
|
+ //cmFbCtlFree(&p->fbc);
|
5638
|
5637
|
return rc;
|
5639
|
5638
|
}
|
5640
|
5639
|
|
|
@@ -5945,8 +5944,8 @@ cmRC_t cmSpecDistExec( cmSpecDist_t* p, const cmSample_t* sp, unsigned sn )
|
5945
|
5944
|
cmVOR_MeanM2(p->oSpecV, p->oSpecM, p->hN, p->pva->binCnt, 0, cmMin(p->fi+1,p->hN));
|
5946
|
5945
|
|
5947
|
5946
|
// store iSpecV and oSpecV to iSpecVa and oSpecVa to create debugging files
|
5948
|
|
- cmVectArrayAppendR(p->iSpecVa,p->iSpecV,p->pva->binCnt);
|
5949
|
|
- cmVectArrayAppendR(p->oSpecVa,p->oSpecV,p->pva->binCnt);
|
|
5947
|
+ //cmVectArrayAppendR(p->iSpecVa,p->iSpecV,p->pva->binCnt);
|
|
5948
|
+ //cmVectArrayAppendR(p->oSpecVa,p->oSpecV,p->pva->binCnt);
|
5950
|
5949
|
|
5951
|
5950
|
p->hi = (p->hi + 1) % p->hN;
|
5952
|
5951
|
}
|