Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Atrac: Read non-streamed data from PSP RAM.

Browse source 
This should fix games that don't actually read into the RAM right away,
which is probably "incorrect" but works on the PSP, should should work in
PPSSPP.
This commit is contained in:
Unknown W. Brackets 2016-01-01 23:53:01 -08:00
parent f0551b4591
commit 4fac4d364e
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Core/HLE/sceAtrac.cpp
View file

@ -297,7 +297,7 @@ struct Atrac {
}
// Make sure to do this late; it depends on things like atracBytesPerFrame.
if (p.mode == p.MODE_READ && data_buf != nullptr) {
if (p.mode == p.MODE_READ && bufferState != ATRAC_STATUS_NO_DATA) {
__AtracSetContext(this);
}
@ -425,6 +425,10 @@ struct Atrac {
currentSample = sample;
}
u8 *BufferStart() {
return ignoreDataBuf ? Memory::GetPointer(first.addr) : data_buf;
}
void SeekToSample(int sample) {
// Discard any pending packet data.
packet->size = 0;
@ -449,7 +453,7 @@ struct Atrac {
const u32 start = off - dataOff < backfill ? dataOff : off - backfill;
for (u32 pos = start; pos < off; pos += atracBytesPerFrame) {
av_init_packet(packet);
packet->data = data_buf + pos;
packet->data = BufferStart() + pos;
packet->size = atracBytesPerFrame;
packet->pos = pos;
@ -468,7 +472,7 @@ struct Atrac {
#ifdef USE_FFMPEG
av_init_packet(packet);
#endif // USE_FFMPEG
packet->data = data_buf + off;
packet->data = BufferStart() + off;
packet->size = std::min((u32)atracBytesPerFrame, first.size - off);
packet->pos = off;
@ -488,7 +492,7 @@ struct Atrac {
bufferPos = dataOff;
}
packet->data = data_buf + bufferPos;
packet->data = BufferStart() + bufferPos;
packet->size = atracBytesPerFrame;
packet->pos = bufferPos;
bufferPos += atracBytesPerFrame;
@ -1751,6 +1755,13 @@ static int _AtracSetData(Atrac *atrac, u32 buffer, u32 bufferSize) {
atrac->CleanStuff();
atrac->SetBufferState();
if (atrac->bufferState == ATRAC_STATUS_ALL_DATA_LOADED || atrac->bufferState == ATRAC_STATUS_HALFWAY_BUFFER) {
// This says, don't use the data_buf array, use the PSP RAM.
// This way, games can load data async into the buffer, and it still works.
// TODO: Support this always, even for streaming.
atrac->ignoreDataBuf = true;
}
if (atrac->codecType == PSP_MODE_AT_3) {
if (atrac->atracChannels == 1) {
WARN_LOG(ME, "This is an atrac3 mono audio");