libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 18:30:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Atrac: Ignore the loopNum value for SAS streams.

Browse Source 
It seems like this is ignored, and games overwrite it with the voice
number and expect it not to change.
This commit is contained in:
Unknown W. Brackets 2015-11-09 08:23:45 -08:00
parent 9462bf3ba7
commit c1d59f263a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/HLE/sceAtrac.cpp
View File

@ -562,6 +562,7 @@ static Atrac *getAtrac(int atracID) {
// Read in any changes from the game to the context.
// TODO: Might be better to just always track in RAM.
atrac->bufferState = atrac->atracContext->info.state;
// This value is actually abused by games to store the SAS voice number.
atrac->loopNum = atrac->atracContext->info.loopNum;
}
@ -976,8 +977,14 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
} else if (!atrac->data_buf) {
ret = ATRAC_ERROR_NO_DATA;
} else {
int loopNum = atrac->loopNum;
if (atrac->bufferState == ATRAC_STATUS_FOR_SCESAS) {
// TODO: Might need more testing.
loopNum = 0;
}
// We already passed the end - return an error (many games check for this.)
if (atrac->currentSample >= atrac->endSample && atrac->loopNum == 0) {
if (atrac->currentSample >= atrac->endSample && loopNum == 0) {
*SamplesNum = 0;
*finish = 1;
ret = ATRAC_ERROR_ALL_DATA_DECODED;
@ -1076,10 +1083,12 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
// TODO: Verify.
bool hitEnd = atrac->currentSample >= atrac->endSample || (numSamples == 0 && atrac->first.size >= atrac->first.filesize);
int loopEndAdjusted = atrac->loopEndSample - atrac->firstOffsetExtra() - atrac->firstSampleoffset;
if ((hitEnd || atrac->currentSample > loopEndAdjusted) && atrac->loopNum != 0) {
if ((hitEnd || atrac->currentSample > loopEndAdjusted) && loopNum != 0) {
atrac->SeekToSample(atrac->loopStartSample - atrac->firstOffsetExtra() - atrac->firstSampleoffset);
if (atrac->loopNum > 0)
atrac->loopNum--;
if (atrac->bufferState == ATRAC_STATUS_FOR_SCESAS) {
if (atrac->loopNum > 0)
atrac->loopNum--;
}
} else if (hitEnd) {
finishFlag = 1;
}