kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

VGMStream plugin correctly fades channel counts other than stereo.

CQTexperiment
Christopher Snowhill 2018-07-17 23:34:25 -07:00
parent 5c25e3b071
commit b3eb934a38
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/vgmstream/vgmstream/VGMDecoder.m
View File

@ -77,14 +77,16 @@
long fadeStart = (framesLength > framesRead) ? framesLength : framesRead; long fadeStart = (framesLength > framesRead) ? framesLength : framesRead;
long fadeEnd = (framesRead + frames) > totalFrames ? totalFrames : (framesRead + frames); long fadeEnd = (framesRead + frames) > totalFrames ? totalFrames : (framesRead + frames);
long fadePos; long fadePos;
long i;
int64_t fadeScale = (int64_t)(totalFrames - fadeStart) * INT_MAX / framesFade; int64_t fadeScale = (int64_t)(totalFrames - fadeStart) * INT_MAX / framesFade;
int64_t fadeStep = INT_MAX / framesFade; int64_t fadeStep = INT_MAX / framesFade;
sbuf += (fadeStart - framesRead) * 2; sbuf += (fadeStart - framesRead) * channels;
for (fadePos = fadeStart; fadePos < fadeEnd; ++fadePos) { for (fadePos = fadeStart; fadePos < fadeEnd; ++fadePos) {
sbuf[ 0 ] = (int16_t)((int64_t)(sbuf[ 0 ]) * fadeScale / INT_MAX); for (i = 0; i < channels; ++i) {
sbuf[ 1 ] = (int16_t)((int64_t)(sbuf[ 1 ]) * fadeScale / INT_MAX); sbuf[ i ] = (int16_t)((int64_t)(sbuf[ i ]) * fadeScale / INT_MAX);
sbuf += 2; }
sbuf += channels;
fadeScale -= fadeStep; fadeScale -= fadeStep;
if (fadeScale <= 0) break; if (fadeScale <= 0) break;
} }