preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-30 19:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Atrac: Handle loop samples more correctly.

Browse Source 
They need to be offset same as currentSamples.  Starting to really think
it'd be better to offset currentSamples instead...
This commit is contained in:
Unknown W. Brackets committed 2015-10-25 17:04:27 -07:00
1 parent 278d6b3690
commit 2b58af3db5
1 file changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceAtrac.cpp
+7 -7
View File
@@ -1027,13 +1027,13 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
int finishFlag = 0;
// TODO: Verify.
if (atrac->loopNum != 0 && (atrac->currentSample > atrac->loopEndSample ||
(numSamples == 0 && atrac->first.size >= atrac->first.filesize))) {
atrac->SeekToSample(atrac->loopStartSample);
bool hitEnd = atrac->currentSample >= atrac->endSample || (numSamples == 0 && atrac->first.size >= atrac->first.filesize);
int loopEndAdjusted = atrac->loopEndSample - firstOffsetExtra - atrac->firstSampleoffset;
if ((hitEnd || atrac->currentSample > loopEndAdjusted) && atrac->loopNum != 0) {
atrac->SeekToSample(atrac->loopStartSample - firstOffsetExtra - atrac->firstSampleoffset);
if (atrac->loopNum > 0)
atrac->loopNum --;
} else if (atrac->currentSample >= atrac->endSample ||
(numSamples == 0 && atrac->first.size >= atrac->first.filesize)) {
atrac->loopNum--;
} else if (hitEnd) {
finishFlag = 1;
}
@@ -1739,8 +1739,8 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) {
atrac->loopNum = loopNum;
if (loopNum != 0 && atrac->loopinfoNum == 0) {
// Just loop the whole audio
atrac->loopStartSample = 0;
int firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
atrac->loopStartSample = atrac->firstSampleoffset + firstOffsetExtra;
atrac->loopEndSample = atrac->endSample + atrac->firstSampleoffset + firstOffsetExtra;
}
}