otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix MultiPCM sample OOB issue

Browse source
This commit is contained in:
cam900 2025-08-30 08:15:13 +09:00
parent 957b57f3d9
commit ffc681b8fa
1 changed files with 52 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/engine/platform/multipcm.cpp
View file

@ -630,7 +630,7 @@ void DivPlatformMultiPCM::renderSamples(int sysID) {
memPos+=length; memPos+=length;
} }
if (actualLength<length) { if (actualLength<length) {
logW("out of OPL4 PCM memory for sample %d!",i); logW("out of MultiPCM memory for sample %d!",i);
break; break;
} }
sampleLoaded[i]=true; sampleLoaded[i]=true;
@ -640,49 +640,65 @@ void DivPlatformMultiPCM::renderSamples(int sysID) {
int insCount=parent->song.insLen; int insCount=parent->song.insLen;
for (int i=0; i<insCount; i++) { for (int i=0; i<insCount; i++) {
DivInstrument* ins=parent->song.ins[i]; DivInstrument* ins=parent->song.ins[i];
DivSample* s=parent->song.sample[ins->amiga.initSample];
unsigned int insAddr=(i*12); unsigned int insAddr=(i*12);
unsigned char bitDepth; short sample=ins->amiga.initSample;
int startPos=sampleOff[ins->amiga.initSample]; if (sample>=0 && sample<parent->song.sampleLen) {
int endPos=CLAMP(s->isLoopable()?s->loopEnd:(s->samples+1),1,0x10000); DivSample* s=parent->song.sample[sample];
int loop=s->isLoopable()?CLAMP(s->loopStart,0,endPos-2):(endPos-2); unsigned char bitDepth;
switch (s->depth) { int startPos=sampleOff[sample];
case DIV_SAMPLE_DEPTH_8BIT: int endPos=CLAMP(s->isLoopable()?s->loopEnd:(s->samples+1),1,0x10000);
bitDepth=0; int loop=s->isLoopable()?CLAMP(s->loopStart,0,endPos-2):(endPos-2);
break; switch (s->depth) {
case DIV_SAMPLE_DEPTH_12BIT: case DIV_SAMPLE_DEPTH_8BIT:
bitDepth=3; bitDepth=0;
if (!s->isLoopable()) { break;
endPos++; case DIV_SAMPLE_DEPTH_12BIT:
loop++; bitDepth=3;
} if (!s->isLoopable()) {
break; endPos++;
default: loop++;
bitDepth=0; }
break; break;
} default:
pcmMem[insAddr]=(bitDepth<<6)|((startPos>>16)&0x1f); bitDepth=0;
pcmMem[1+insAddr]=(startPos>>8)&0xff; break;
pcmMem[2+insAddr]=(startPos)&0xff; }
pcmMem[3+insAddr]=(loop>>8)&0xff; pcmMem[insAddr]=(bitDepth<<6)|((startPos>>16)&0x1f);
pcmMem[4+insAddr]=(loop)&0xff; pcmMem[1+insAddr]=(startPos>>8)&0xff;
pcmMem[5+insAddr]=((~(endPos-1))>>8)&0xff; pcmMem[2+insAddr]=(startPos)&0xff;
pcmMem[6+insAddr]=(~(endPos-1))&0xff; pcmMem[3+insAddr]=(loop>>8)&0xff;
if (ins->type==DIV_INS_MULTIPCM) { pcmMem[4+insAddr]=(loop)&0xff;
pcmMem[7+insAddr]=(ins->multipcm.lfo<<3)|ins->multipcm.vib; // LFO, VIB pcmMem[5+insAddr]=((~(endPos-1))>>8)&0xff;
pcmMem[8+insAddr]=(ins->multipcm.ar<<4)|ins->multipcm.d1r; // AR, D1R pcmMem[6+insAddr]=(~(endPos-1))&0xff;
pcmMem[9+insAddr]=(ins->multipcm.dl<<4)|ins->multipcm.d2r; // DL, D2R if (ins->type==DIV_INS_MULTIPCM) {
pcmMem[10+insAddr]=(ins->multipcm.rc<<4)|ins->multipcm.rr; // RC, RR pcmMem[7+insAddr]=(ins->multipcm.lfo<<3)|ins->multipcm.vib; // LFO, VIB
pcmMem[11+insAddr]=ins->multipcm.am; // AM pcmMem[8+insAddr]=(ins->multipcm.ar<<4)|ins->multipcm.d1r; // AR, D1R
pcmMem[9+insAddr]=(ins->multipcm.dl<<4)|ins->multipcm.d2r; // DL, D2R
pcmMem[10+insAddr]=(ins->multipcm.rc<<4)|ins->multipcm.rr; // RC, RR
pcmMem[11+insAddr]=ins->multipcm.am; // AM
} else {
pcmMem[7+insAddr]=0; // LFO, VIB
pcmMem[8+insAddr]=(0xf<<4)|(0xf<<0); // AR, D1R
pcmMem[9+insAddr]=0; // DL, D2R
pcmMem[10+insAddr]=(0xf<<4)|(0xf<<0); // RC, RR
pcmMem[11+insAddr]=0; // AM
}
} else { } else {
// fill to dummy instrument
pcmMem[insAddr]=0;
pcmMem[1+insAddr]=0;
pcmMem[2+insAddr]=0;
pcmMem[3+insAddr]=0;
pcmMem[4+insAddr]=0;
pcmMem[5+insAddr]=0xff;
pcmMem[6+insAddr]=0xff;
pcmMem[7+insAddr]=0; // LFO, VIB pcmMem[7+insAddr]=0; // LFO, VIB
pcmMem[8+insAddr]=(0xf<<4)|(0xf<<0); // AR, D1R pcmMem[8+insAddr]=(0xf<<4)|(0xf<<0); // AR, D1R
pcmMem[9+insAddr]=0; // DL, D2R pcmMem[9+insAddr]=(0xf<<4); // DL, D2R
pcmMem[10+insAddr]=(0xf<<4)|(0xf<<0); // RC, RR pcmMem[10+insAddr]=(0xf<<4)|(0xf<<0); // RC, RR
pcmMem[11+insAddr]=0; // AM pcmMem[11+insAddr]=0; // AM
} }
} }
memCompo.used=pcmMemLen; memCompo.used=pcmMemLen;
} }
memCompo.capacity=getSampleMemCapacity(0); memCompo.capacity=getSampleMemCapacity(0);