Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-26 00:45:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Atrac: DRY a tiny bit of the code down.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-11-08 08:45:13 -08:00
parent 87cf8029f1
commit a0604c6de3
1 changed files with 40 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Core/HLE/sceAtrac.cpp
View File

@ -190,11 +190,10 @@ struct Atrac {
bufferState = ATRAC_STATUS_ALL_DATA_LOADED;
}
} else {
int firstOffsetExtra = codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
if (loopEndSample <= 0) {
// There's no looping, but we need to stream the data in our buffer.
bufferState = ATRAC_STATUS_STREAMED_WITHOUT_LOOP;
} else if (loopEndSample == endSample + firstSampleoffset + firstOffsetExtra) {
} else if (loopEndSample == endSample + firstSampleoffset + firstOffsetExtra()) {
bufferState = ATRAC_STATUS_STREAMED_LOOP_FROM_END;
} else {
bufferState = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER;
@ -280,16 +279,22 @@ struct Atrac {
int Analyze();
int AnalyzeAA3();
u32 samplesPerFrame() const {
return codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES;
}
u32 firstOffsetExtra() const {
return codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
}
u32 getDecodePosBySample(int sample) const {
int atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
return (u32)(firstSampleoffset + sample / atracSamplesPerFrame * atracBytesPerFrame );
return (u32)(firstSampleoffset + sample / (int)samplesPerFrame() * atracBytesPerFrame);
}
u32 getFileOffsetBySample(int sample) const {
int atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
// This matches where ffmpeg was getting the packets, but it's not clear why the first atracBytesPerFrame is there...
int offsetSample = sample + firstSampleoffset;
int frameOffset = offsetSample / atracSamplesPerFrame;
int frameOffset = offsetSample / (int)samplesPerFrame();
return (u32)(dataOff + atracBytesPerFrame + frameOffset * atracBytesPerFrame);
}
@ -308,9 +313,7 @@ struct Atrac {
}
// Since the first frame is shorter by this offset, add to round up at this offset.
const u32 firstOffsetExtra = codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
int atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
const int remainingBytes = first.fileoffset - getFileOffsetBySample(currentSample - atracSamplesPerFrame + firstOffsetExtra);
const int remainingBytes = first.fileoffset - getFileOffsetBySample(currentSample - samplesPerFrame() + firstOffsetExtra());
return remainingBytes / atracBytesPerFrame;
}
@ -393,16 +396,12 @@ struct Atrac {
}
void SeekToSample(int sample) {
const u32 atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
// Discard any pending packet data.
packet->size = 0;
// Some kind of header size?
const u32 firstOffsetExtra = codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
// It seems like the PSP aligns the sample position to 0x800...?
const u32 offsetSamples = firstSampleoffset + firstOffsetExtra;
const u32 unalignedSamples = (offsetSamples + sample) % atracSamplesPerFrame;
const u32 offsetSamples = firstSampleoffset + firstOffsetExtra();
const u32 unalignedSamples = (offsetSamples + sample) % samplesPerFrame();
int seekFrame = sample + offsetSamples - unalignedSamples;
#ifdef USE_FFMPEG
@ -799,25 +798,22 @@ int Atrac::Analyze() {
return ATRAC_ERROR_SIZE_TOO_SMALL;
}
int firstOffsetExtra = codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
// set the loopStartSample and loopEndSample by loopinfo
if (loopinfoNum > 0) {
loopStartSample = loopinfo[0].startSample + firstOffsetExtra + sampleOffsetAdjust;
loopEndSample = loopinfo[0].endSample + firstOffsetExtra + sampleOffsetAdjust;
loopStartSample = loopinfo[0].startSample + firstOffsetExtra() + sampleOffsetAdjust;
loopEndSample = loopinfo[0].endSample + firstOffsetExtra() + sampleOffsetAdjust;
} else {
loopStartSample = loopEndSample = -1;
}
// if there is no correct endsample, try to guess it
if (endSample <= 0 && atracBytesPerFrame != 0) {
int atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
endSample = (dataChunkSize / atracBytesPerFrame) * atracSamplesPerFrame;
endSample -= firstSampleoffset + firstOffsetExtra;
endSample = (dataChunkSize / atracBytesPerFrame) * samplesPerFrame();
endSample -= firstSampleoffset + firstOffsetExtra();
}
endSample -= 1;
if (loopEndSample != -1 && loopEndSample > endSample + firstSampleoffset + firstOffsetExtra) {
if (loopEndSample != -1 && loopEndSample > endSample + firstSampleoffset + (int)firstOffsetExtra()) {
WARN_LOG_REPORT(ME, "Atrac loop after end of data");
return ATRAC_ERROR_BAD_CODEC_PARAMS;
}
@ -881,8 +877,7 @@ int Atrac::AnalyzeAA3() {
dataOff = 10 + tagSize + 96;
firstSampleoffset = 0;
if (endSample < 0 && atracBytesPerFrame != 0) {
int atracSamplesPerFrame = (codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
endSample = ((first.filesize - dataOff) / atracBytesPerFrame) * atracSamplesPerFrame;
endSample = ((first.filesize - dataOff) / atracBytesPerFrame) * samplesPerFrame();
}
endSample -= 1;
@ -988,18 +983,15 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
} else {
// TODO: This isn't at all right, but at least it makes the music "last" some time.
u32 numSamples = 0;
u32 atracSamplesPerFrame = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
// Some kind of header size?
u32 firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
// It seems like the PSP aligns the sample position to 0x800...?
int offsetSamples = atrac->firstSampleoffset + firstOffsetExtra;
int offsetSamples = atrac->firstSampleoffset + atrac->firstOffsetExtra();
int skipSamples = 0;
u32 maxSamples = atrac->endSample + 1 - atrac->currentSample;
u32 unalignedSamples = (offsetSamples + atrac->currentSample) % atracSamplesPerFrame;
u32 unalignedSamples = (offsetSamples + atrac->currentSample) % atrac->samplesPerFrame();
if (unalignedSamples != 0) {
// We're off alignment, possibly due to a loop. Force it back on.
maxSamples = atracSamplesPerFrame - unalignedSamples;
maxSamples = atrac->samplesPerFrame() - unalignedSamples;
skipSamples = unalignedSamples;
}
@ -1066,7 +1058,7 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
// Never got a frame. We may have dropped a GHA frame or otherwise have a bug.
// For now, let's try to provide an extra "frame" if possible so games don't infinite loop.
if (atrac->getFileOffsetBySample(atrac->currentSample) < atrac->first.filesize) {
numSamples = std::min(maxSamples, atracSamplesPerFrame);
numSamples = std::min(maxSamples, atrac->samplesPerFrame());
u32 outBytes = numSamples * atrac->atracOutputChannels * sizeof(s16);
memset(outbuf, 0, outBytes);
CBreakPoints::ExecMemCheck(outbufPtr, true, outBytes, currentMIPS->pc);
@ -1082,9 +1074,9 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
int finishFlag = 0;
// TODO: Verify.
bool hitEnd = atrac->currentSample >= atrac->endSample || (numSamples == 0 && atrac->first.size >= atrac->first.filesize);
int loopEndAdjusted = atrac->loopEndSample - firstOffsetExtra - atrac->firstSampleoffset;
int loopEndAdjusted = atrac->loopEndSample - atrac->firstOffsetExtra() - atrac->firstSampleoffset;
if ((hitEnd || atrac->currentSample > loopEndAdjusted) && atrac->loopNum != 0) {
atrac->SeekToSample(atrac->loopStartSample - firstOffsetExtra - atrac->firstSampleoffset);
atrac->SeekToSample(atrac->loopStartSample - atrac->firstOffsetExtra() - atrac->firstSampleoffset);
if (atrac->loopNum > 0)
atrac->loopNum--;
} else if (hitEnd) {
@ -1160,16 +1152,15 @@ static void AtracGetResetBufferInfo(Atrac *atrac, AtracResetBufferInfo *bufferIn
atrac->first.writableBytes = bufferInfo->first.writableBytes;
} else {
// This is without the sample offset. The file offset also includes the previous batch of samples?
const int atracSamplesPerFrame = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
int sampleFileOffset = atrac->getFileOffsetBySample(sample - atrac->firstSampleoffset - atracSamplesPerFrame);
int sampleFileOffset = atrac->getFileOffsetBySample(sample - atrac->firstSampleoffset - atrac->samplesPerFrame());
// Update the writable bytes. When streaming, this is just the number of bytes until the end.
const u32 bufSizeAligned = (atrac->atracBufSize / atrac->atracBytesPerFrame) * atrac->atracBytesPerFrame;
const int needsMoreFrames = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
const int needsMoreFrames = atrac->firstOffsetExtra();
bufferInfo->first.writePosPtr = atrac->first.addr;
bufferInfo->first.writableBytes = std::min(atrac->first.filesize - sampleFileOffset, bufSizeAligned);
if (((sample + atrac->firstSampleoffset) % atracSamplesPerFrame) >= atracSamplesPerFrame - needsMoreFrames) {
if (((sample + atrac->firstSampleoffset) % (int)atrac->samplesPerFrame()) >= (int)atrac->samplesPerFrame() - needsMoreFrames) {
// Not clear why, but it seems it wants a bit extra in case the sample is late?
bufferInfo->first.minWriteBytes = atrac->atracBytesPerFrame * 3;
} else {
@ -1302,8 +1293,7 @@ static u32 sceAtracGetMaxSample(int atracID, u32 maxSamplesAddr) {
} else {
DEBUG_LOG(ME, "sceAtracGetMaxSample(%i, %08x)", atracID, maxSamplesAddr);
if (Memory::IsValidAddress(maxSamplesAddr)) {
int atracSamplesPerFrame = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
Memory::Write_U32(atracSamplesPerFrame, maxSamplesAddr);
Memory::Write_U32(atrac->samplesPerFrame(), maxSamplesAddr);
}
}
return 0;
@ -1346,23 +1336,20 @@ static u32 sceAtracGetNextSample(int atracID, u32 outNAddr) {
DEBUG_LOG(ME, "sceAtracGetNextSample(%i, %08x): 0 samples left", atracID, outNAddr);
return 0;
} else {
u32 atracSamplesPerFrame = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
// Some kind of header size?
u32 firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
// It seems like the PSP aligns the sample position to 0x800...?
u32 skipSamples = atrac->firstSampleoffset + firstOffsetExtra;
u32 firstSamples = (atracSamplesPerFrame - skipSamples) % atracSamplesPerFrame;
u32 skipSamples = atrac->firstSampleoffset + atrac->firstOffsetExtra();
u32 firstSamples = (atrac->samplesPerFrame() - skipSamples) % atrac->samplesPerFrame();
u32 numSamples = atrac->endSample + 1 - atrac->currentSample;
if (atrac->currentSample == 0 && firstSamples != 0) {
numSamples = firstSamples;
}
u32 unalignedSamples = (skipSamples + atrac->currentSample) % atracSamplesPerFrame;
u32 unalignedSamples = (skipSamples + atrac->currentSample) % atrac->samplesPerFrame();
if (unalignedSamples != 0) {
// We're off alignment, possibly due to a loop. Force it back on.
numSamples = atracSamplesPerFrame - unalignedSamples;
numSamples = atrac->samplesPerFrame() - unalignedSamples;
}
if (numSamples > atracSamplesPerFrame)
numSamples = atracSamplesPerFrame;
if (numSamples > atrac->samplesPerFrame())
numSamples = atrac->samplesPerFrame();
if (Memory::IsValidAddress(outNAddr))
Memory::Write_U32(numSamples, outNAddr);
DEBUG_LOG(ME, "sceAtracGetNextSample(%i, %08x): %d samples left", atracID, outNAddr, numSamples);
@ -1868,9 +1855,8 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) {
atrac->loopNum = loopNum;
if (loopNum != 0 && atrac->loopinfoNum == 0) {
// Just loop the whole audio
int firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
atrac->loopStartSample = atrac->firstSampleoffset + firstOffsetExtra;
atrac->loopEndSample = atrac->endSample + atrac->firstSampleoffset + firstOffsetExtra;
atrac->loopStartSample = atrac->firstSampleoffset + atrac->firstOffsetExtra();
atrac->loopEndSample = atrac->endSample + atrac->firstSampleoffset + atrac->firstOffsetExtra();
}
}
return 0;
@ -2126,16 +2112,14 @@ void _AtracGenerateContext(Atrac *atrac, SceAtracId *context) {
// TODO: Should we just keep this in PSP ram then, or something?
context->info.state = atrac->bufferState;
if (atrac->firstSampleoffset != 0) {
const u32 firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
context->info.samplesPerChan = atrac->firstSampleoffset + firstOffsetExtra;
context->info.samplesPerChan = atrac->firstSampleoffset + atrac->firstOffsetExtra();
} else {
context->info.samplesPerChan = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
}
context->info.sampleSize = atrac->atracBytesPerFrame;
context->info.numChan = atrac->atracChannels;
context->info.dataOff = atrac->dataOff;
int firstOffsetExtra = atrac->codecType == PSP_CODEC_AT3PLUS ? 368 : 69;
context->info.endSample = atrac->endSample + atrac->firstSampleoffset + firstOffsetExtra;
context->info.endSample = atrac->endSample + atrac->firstSampleoffset + atrac->firstOffsetExtra();
context->info.dataEnd = atrac->first.filesize;
context->info.curOff = atrac->getFileOffsetBySample(atrac->currentSample);
context->info.decodePos = atrac->getDecodePosBySample(atrac->currentSample);