etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 16:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

prevent clipping in ADPCM samples

Browse source
This commit is contained in:
tildearrow 2021-12-27 15:22:57 -05:00
parent f32c2fa06b
commit 11478fbdfe
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/engine.cpp
View file

@ -1367,6 +1367,8 @@ void DivEngine::renderSamples() {
step=adSteps[index]; step=adSteps[index];
short sample=(j<s->rendLength)?((s->depth==16)?(s->rendData[j]>>4):(s->rendData[j]<<4)):0; short sample=(j<s->rendLength)?((s->depth==16)?(s->rendData[j]>>4):(s->rendData[j]<<4)):0;
if (sample>0x7d0) sample=0x7d0;
if (sample<-0x7d0) sample=-0x7d0;
diff=sample-predsample; diff=sample-predsample;
if (diff>=0) { if (diff>=0) {
encoded=0; encoded=0;
@ -1389,6 +1391,9 @@ void DivEngine::renderSamples() {
if (diff>=tempstep) encoded|=1; if (diff>=tempstep) encoded|=1;
acc+=jediTable[decstep+encoded]; acc+=jediTable[decstep+encoded];
if (acc>0x7ff || acc<-0x800) {
logW("clipping! %d\n",acc);
}
acc&=0xfff; acc&=0xfff;
if (acc&0x800) acc|=~0xfff; if (acc&0x800) acc|=~0xfff;
decstep+=adStepSeek[encoded&7]*16; decstep+=adStepSeek[encoded&7]*16;
@ -1552,6 +1557,7 @@ void DivEngine::reset() {
extValuePresent=0; extValuePresent=0;
speed1=song.speed1; speed1=song.speed1;
speed2=song.speed2; speed2=song.speed2;
globalPitch=0;
dispatch->reset(); dispatch->reset();
} }

2
src/engine/engine.h
View file

@ -80,7 +80,7 @@ class DivEngine {
bool extValuePresent; bool extValuePresent;
bool repeatPattern; bool repeatPattern;
int ticks, cycles, curRow, curOrder, remainingLoops, nextSpeed, clockDrift; int ticks, cycles, curRow, curOrder, remainingLoops, nextSpeed, clockDrift;
int changeOrd, changePos, totalTicks, totalCmds, lastCmds, cmdsPerSecond; int changeOrd, changePos, totalTicks, totalCmds, lastCmds, cmdsPerSecond, globalPitch;
unsigned char extValue; unsigned char extValue;
unsigned char speed1, speed2; unsigned char speed1, speed2;
DivStatusView view; DivStatusView view;