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

QSound: Fix ADPCM Address and code style,

Browse source 
Add QSound ADPCM sample warning:
Because QSound ADPCM has twice long max sample length but start/end addresses are byte aligned, doesn't have loop and pitch (fixed to output rate / 3).
This commit is contained in:
cam900 2025-08-20 16:19:13 +09:00 committed by tildearrow
parent ee64dd6a16
commit 44b2d3d037
2 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/engine/platform/qsound.cpp
View file

@ -307,39 +307,44 @@ void DivPlatformQSound::tick(bool sysTick) {
} }
} }
} }
uint16_t qsound_bank = 0; uint16_t qsoundBank=0;
uint16_t qsound_addr = 0; uint16_t qsoundAddr=0;
uint16_t qsound_loop = 0; uint16_t qsoundLoop=0;
uint16_t qsound_end = 0; uint16_t qsoundEnd=0;
if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) { if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) {
DivSample* s=parent->getSample(chan[i].sample); DivSample* s=parent->getSample(chan[i].sample);
if (i<16) { if (i<16) {
qsound_bank = 0x8000 | (offPCM[chan[i].sample] >> 16); qsoundBank=0x8000|(offPCM[chan[i].sample]>>16);
qsound_addr = offPCM[chan[i].sample] & 0xffff; qsoundAddr=offPCM[chan[i].sample]&0xffff;
} else { } else {
qsound_bank = 0x8000 | (offBS[chan[i].sample] >> 16); qsoundBank=0x8000|(offBS[chan[i].sample]>>16);
qsound_addr = offBS[chan[i].sample] & 0xffff; qsoundAddr=offBS[chan[i].sample]&0xffff;
} }
int loopStart=s->loopStart; int loopStart=s->loopStart;
int length = s->loopEnd; int length=s->loopEnd;
if (length > 65536 - 16) { if (i<16) {
length = 65536 - 16; if (length>65536-16) {
} length=65536-16;
if (!s->isLoopable()) {
if (i<16) {
qsound_end = offPCM[chan[i].sample] + length + 15;
} else {
qsound_end = offBS[chan[i].sample] + (length>>1) + 15;
} }
qsound_loop = 15;
} else { } else {
if (i<16) { // ADPCM address is byte aligned
qsound_end = offPCM[chan[i].sample] + length; length>>=1;
} else { if (length>65535) {
qsound_end = offBS[chan[i].sample] + (length>>1); length=65535;
} }
qsound_loop = length - loopStart; }
if (i<16) {
if (!s->isLoopable()) {
qsoundEnd=offPCM[chan[i].sample]+length+15;
qsoundLoop=15;
} else {
qsoundEnd=offPCM[chan[i].sample]+length;
qsoundLoop=length-loopStart;
}
} else {
// ADPCM can't loop
qsoundEnd=offBS[chan[i].sample]+length;
} }
} }
if (NEW_ARP_STRAT) { if (NEW_ARP_STRAT) {
@ -406,19 +411,19 @@ void DivPlatformQSound::tick(bool sysTick) {
} }
if (i<16) { if (i<16) {
rWrite(q1_reg_map[Q1V_BANK][i], qsound_bank); rWrite(q1_reg_map[Q1V_BANK][i], qsoundBank);
rWrite(q1_reg_map[Q1V_END][i], qsound_end); rWrite(q1_reg_map[Q1V_END][i], qsoundEnd);
rWrite(q1_reg_map[Q1V_LOOP][i], qsound_loop); rWrite(q1_reg_map[Q1V_LOOP][i], qsoundLoop);
rWrite(q1_reg_map[Q1V_START][i], qsound_addr+chan[i].audPos); rWrite(q1_reg_map[Q1V_START][i], qsoundAddr+chan[i].audPos);
rWrite(q1_reg_map[Q1V_PHASE][i], 0x8000); rWrite(q1_reg_map[Q1V_PHASE][i], 0x8000);
} else { } else {
rWrite(Q1A_KEYON+(i-16),0); rWrite(Q1A_KEYON+(i-16),0);
rWrite(q1a_bank_map[i-16], qsound_bank); rWrite(q1a_bank_map[i-16], qsoundBank);
rWrite(q1a_end_map[i-16], qsound_end); rWrite(q1a_end_map[i-16], qsoundEnd);
rWrite(q1a_start_map[i-16], qsound_addr+chan[i].audPos); rWrite(q1a_start_map[i-16], qsoundAddr+chan[i].audPos);
rWrite(Q1A_KEYON+(i-16),1); rWrite(Q1A_KEYON+(i-16),1);
} }
//logV("ch %d bank=%04x, addr=%04x, end=%04x, loop=%04x!",i,qsound_bank,qsound_addr,qsound_end,qsound_loop); //logV("ch %d bank=%04x, addr=%04x, end=%04x, loop=%04x!",i,qsoundBank,qsoundAddr,qsoundEnd,qsoundLoop);
// Write sample address. Enable volume // Write sample address. Enable volume
if (!chan[i].std.vol.had) { if (!chan[i].std.vol.had) {
if (chan[i].isNewQSound) { if (chan[i].isNewQSound) {
@ -841,7 +846,7 @@ void DivPlatformQSound::renderSamples(int sysID) {
} }
offBS[i]=memPos; offBS[i]=memPos;
memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_SAMPLE_ALT1,"ADPCM",i,memPos,memPos+length)); memCompo.entries.push_back(DivMemoryEntry(DIV_MEMORY_SAMPLE_ALT1,"ADPCM",i,memPos,memPos+length));
memPos+=length+16; memPos+=length;
} }
sampleMemLenBS=memPos+256; sampleMemLenBS=memPos+256;

15
src/gui/sampleEdit.cpp
View file

@ -256,12 +256,21 @@ void FurnaceGUI::drawSampleEdit() {
break; break;
case DIV_SYSTEM_QSOUND: case DIV_SYSTEM_QSOUND:
if (sample->loop) { if (sample->loop) {
if (sample->loopEnd-sample->loopStart>32767) { if (sample->depth==DIV_SAMPLE_DEPTH_QSOUND_ADPCM) {
SAMPLE_WARN(warnLoop,_("QSound: ADPCM samples can't loop"));
} else if (sample->loopEnd-sample->loopStart>32767) {
SAMPLE_WARN(warnLoopPos,_("QSound: loop cannot be longer than 32767 samples")); SAMPLE_WARN(warnLoopPos,_("QSound: loop cannot be longer than 32767 samples"));
} }
} }
if (sample->samples>65535) { if (sample->depth==DIV_SAMPLE_DEPTH_QSOUND_ADPCM) {
SAMPLE_WARN(warnLength,"QSound: maximum sample length is 65535"); if (sample->samples>131070) {
SAMPLE_WARN(warnLength,"QSound: maximum ADPCM sample length is 131070");
}
if (dispatch!=NULL) {
EXACT_RATE("QSound (ADPCM)",dispatch->chipClock/7488.0);
}
} else if (sample->samples>65535) {
SAMPLE_WARN(warnLength,"QSound: maximum PCM sample length is 65535");
} }
break; break;
case DIV_SYSTEM_NES: { case DIV_SYSTEM_NES: {