cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwAudioFileOps.cpp : Fixed regression in parallelMix().

Browse Source
This commit is contained in:
kevin 2020-09-24 12:39:19 -04:00
parent be361fcbd6
commit 9b97662d62
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cwAudioFileOps.cpp
View File

@ -616,12 +616,10 @@ cw::rc_t cw::afop::cutAndMix( const object_t* cfg )
cw::rc_t cw::afop::parallelMix( const char* dstFn, unsigned dstBits, const char* srcDir, const parallelMixArg_t* argL, unsigned argN ) cw::rc_t cw::afop::parallelMix( const char* dstFn, unsigned dstBits, const char* srcDir, const parallelMixArg_t* argL, unsigned argN )
{ {
// Note that the length of each source clip is extended by 'fadeOutSec' to overlap with the first 'fadeOutSec'
// milliseconds of the following clip. The output start time of each source clip is therefore the same
// as it's input start time.
double fadeInSec = 0; double fadeInSec = 0;
cutMixArg_t cmArgL[ argN ]; cutMixArg_t cmArgL[ argN ];
double dstBegSec = 0;
memset(&cmArgL,0,sizeof(cmArgL)); memset(&cmArgL,0,sizeof(cmArgL));
for(unsigned i=0; i<argN; ++i) for(unsigned i=0; i<argN; ++i)
@ -631,8 +629,9 @@ cw::rc_t cw::afop::parallelMix( const char* dstFn, unsigned dstBits, const char*
cmArgL[i].srcEndSec = argL[i].srcEndSec + argL[i].fadeOutSec; cmArgL[i].srcEndSec = argL[i].srcEndSec + argL[i].fadeOutSec;
cmArgL[i].srcBegFadeSec = fadeInSec; cmArgL[i].srcBegFadeSec = fadeInSec;
cmArgL[i].srcEndFadeSec = argL[i].fadeOutSec; cmArgL[i].srcEndFadeSec = argL[i].fadeOutSec;
cmArgL[i].dstBegSec = argL[i].srcBegSec; cmArgL[i].dstBegSec = dstBegSec;
dstBegSec += argL[i].srcEndSec - argL[i].srcBegSec;
fadeInSec = argL[i].fadeOutSec; fadeInSec = argL[i].fadeOutSec;
} }