diff options
| author | John Glover <john@john-glovers-macbook.local> | 2010-12-17 18:12:52 +0000 |
|---|---|---|
| committer | John Glover <john@john-glovers-macbook.local> | 2010-12-17 18:12:52 +0000 |
| commit | 3f5c5d34d99b121bb621230a918b621a9524a015 (patch) | |
| tree | 7ffd1b25480f6c8ca359ca180e0af58858f3568b /sms/analysis.c | |
| parent | 20473bc111d2ec16dbe1403b0d8e4d963e15c0c3 (diff) | |
| download | simpl-3f5c5d34d99b121bb621230a918b621a9524a015.tar.gz simpl-3f5c5d34d99b121bb621230a918b621a9524a015.tar.bz2 simpl-3f5c5d34d99b121bb621230a918b621a9524a015.zip | |
Removed static variables from sms_residual, changed the method signature to accept an SMS_ResidualParams structure.
Diffstat (limited to 'sms/analysis.c')
| -rw-r--r-- | sms/analysis.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sms/analysis.c b/sms/analysis.c index 9e22ca3..a6b344d 100644 --- a/sms/analysis.c +++ b/sms/analysis.c @@ -339,11 +339,6 @@ int sms_findResidual(int sizeSynthesis, sfloat* pSynthesis, sms_error("Residual signal length is smaller than the original signal length"); return -1; } - /*if(sizeSynthesis > sizeOriginal)*/ - /*{*/ - /* printf("Warning: synthesised signal is longer than the orignal signal. ");*/ - /* printf("Orignal will be zero padded.\n");*/ - /*}*/ /*sms_residual(sizeResidual, pSynthesis, pOriginal, pResidual);*/ return 0; @@ -558,8 +553,7 @@ int sms_analyze(int sizeWaveform, sfloat *pWaveform, SMS_Data *pSmsData, SMS_Ana pAnalParams->fResidualAccumPerc += sms_residual(sizeData, pAnalParams->synthBuffer.pFBuffer, pOriginal, - pAnalParams->residualParams.residual, - pAnalParams->residualParams.residualWindow); + &pAnalParams->residualParams); if(pAnalParams->iStochasticType == SMS_STOC_APPROX) { |