From 1983ab16c680ee76f2231b0665b55fa30caa8650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 22 Jul 2025 16:05:02 +0200 Subject: [PATCH 1/2] sceAtrac: Call AnalyzeAA3Track for AA3 data, oops. --- Core/HLE/sceAtrac.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 1fafd0b614..c0d14ad83f 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -970,7 +970,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) { Track track; std::string error; - int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), bufferSize, &track, &error); + int ret = AnalyzeAA3Track(Memory::GetPointerOrNull(buffer), bufferSize, fileSize, &track, &error); if (ret < 0) { return hleLogError(Log::Atrac, ret, "%s", error.c_str()); } @@ -996,7 +996,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf Track track; std::string error; - int ret = AnalyzeAtracTrack(Memory::GetPointerOrNull(buffer), readSize, &track, &error); + int ret = AnalyzeAA3Track(Memory::GetPointerOrNull(buffer), readSize, fileSize, &track, &error); if (ret < 0) { return hleLogError(Log::Atrac, ret, "%s", error.c_str()); } From 4d7b51d8cb3b61f93b15dd4dd1ccbb6cb5ee5dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 22 Jul 2025 17:17:01 +0200 Subject: [PATCH 2/2] Reimplement AA3 header parsing --- Core/HLE/AtracBase.h | 2 +- Core/HLE/AtracCtx.cpp | 2 +- Core/HLE/AtracCtx.h | 2 +- Core/HLE/AtracCtx2.cpp | 21 ++++-- Core/HLE/AtracCtx2.h | 2 +- Core/HLE/ErrorCodes.h | 2 + Core/HLE/sceAtrac.cpp | 20 +++--- Core/HLE/sceKernel.cpp | 1 + Core/Util/AtracTrack.cpp | 139 ++++++++++++++++++++++++++++++++++++++- Core/Util/AtracTrack.h | 1 + 10 files changed, 170 insertions(+), 22 deletions(-) diff --git a/Core/HLE/AtracBase.h b/Core/HLE/AtracBase.h index c6b6c96619..2c29ccb8e8 100644 --- a/Core/HLE/AtracBase.h +++ b/Core/HLE/AtracBase.h @@ -221,7 +221,7 @@ public: virtual int AddStreamData(u32 bytesToAdd) = 0; virtual int ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf, bool *delay) = 0; virtual int GetBufferInfoForResetting(AtracResetBufferInfo *bufferInfo, int sample, bool *delay) = 0; // NOTE: Not const! This can cause SkipFrames! - virtual int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels) = 0; + virtual int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, u32 fileSize, int outputChannels, bool isAA3) = 0; virtual int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) const = 0; virtual int SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) = 0; diff --git a/Core/HLE/AtracCtx.cpp b/Core/HLE/AtracCtx.cpp index 9f9b84271f..1906b80708 100644 --- a/Core/HLE/AtracCtx.cpp +++ b/Core/HLE/AtracCtx.cpp @@ -390,7 +390,7 @@ int Atrac::GetBufferInfoForResetting(AtracResetBufferInfo *bufferInfo, int sampl return 0; } -int Atrac::SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels) { +int Atrac::SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, u32 fileSize, int outputChannels, bool isAA3) { // 72 is about the size of the minimum required data to even be valid. if (readSize < 72) { return SCE_ERROR_ATRAC_SIZE_TOO_SMALL; diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h index 17dea45e38..4d86056044 100644 --- a/Core/HLE/AtracCtx.h +++ b/Core/HLE/AtracCtx.h @@ -97,7 +97,7 @@ public: int AddStreamData(u32 bytesToAdd) override; int ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf, bool *delay) override; int GetBufferInfoForResetting(AtracResetBufferInfo *bufferInfo, int sample, bool *delay) override; // NOTE: Not const! This can cause SkipFrames! (although only in the AtracCtx2) - int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels) override; + int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, u32 fileSize, int outputChannels, bool isAA3) override; int GetSecondBufferInfo(u32 *fileOffset, u32 *desiredSize) const override; int SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; u32 DecodeData(u8 *outbuf, u32 outbufPtr, int *SamplesNum, int *finish, int *remains) override; diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp index 009e124860..28056265cd 100644 --- a/Core/HLE/AtracCtx2.cpp +++ b/Core/HLE/AtracCtx2.cpp @@ -206,8 +206,7 @@ int InitContextFromTrackInfo(SceAtracContext *ctx, const TrackInfo *wave, u32 bu (ctx->info).firstValidSample = extraSamples + wave->firstSampleOffset; int endSample3 = wave->endSample; (ctx->info).sampleSize = wave->blockAlign; - InitLengthAndLoop(&ctx->info, endSample3, wave->waveDataSize, wave->firstSampleOffset, wave->loopStart, - wave->loopEnd); + InitLengthAndLoop(&ctx->info, endSample3, wave->waveDataSize, wave->firstSampleOffset, wave->loopStart, wave->loopEnd); const int dataOff = wave->dataOff; const int endSample = (ctx->info).endSample; (ctx->info).streamDataByte = readSize - dataOff; @@ -959,13 +958,21 @@ u32 Atrac2::DecodeInternal(u32 outbufAddr, int *SamplesNum, int *finish) { return 0; } -int Atrac2::SetData(const Track &track, u32 bufferAddr, u32 readSize, u32 bufferSize, int outputChannels) { +int Atrac2::SetData(const Track &track, u32 bufferAddr, u32 readSize, u32 bufferSize, u32 fileSize, int outputChannels, bool isAA3) { TrackInfo trackInfo{}; if (bufferAddr) { - int retval = ParseWaveAT3(Memory::GetPointerRange(bufferAddr, bufferSize), readSize, &trackInfo); - if (retval < 0) { - ERROR_LOG(Log::Atrac, "Atrac2::SetData: ParseWaveAT3 failed with %08x", retval); - return retval; + if (!isAA3) { + int retval = ParseWaveAT3(Memory::GetPointerRange(bufferAddr, bufferSize), readSize, &trackInfo); + if (retval < 0) { + ERROR_LOG(Log::Atrac, "Atrac2::SetData: ParseWaveAT3 failed with %08x", retval); + return retval; + } + } else { + int retval = ParseAA3(Memory::GetPointerRange(bufferAddr, bufferSize), readSize, fileSize, &trackInfo); + if (retval < 0) { + ERROR_LOG(Log::Atrac, "Atrac2::SetData: ParseAA3 failed with %08x", retval); + return retval; + } } } diff --git a/Core/HLE/AtracCtx2.h b/Core/HLE/AtracCtx2.h index f47f9a03bf..ab553aa4c5 100644 --- a/Core/HLE/AtracCtx2.h +++ b/Core/HLE/AtracCtx2.h @@ -33,7 +33,7 @@ public: int AddStreamData(u32 bytesToAdd) override; int ResetPlayPosition(int sample, int bytesWrittenFirstBuf, int bytesWrittenSecondBuf, bool *delay) override; int GetBufferInfoForResetting(AtracResetBufferInfo *bufferInfo, int sample, bool *delay) override; - int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, int outputChannels) override; + int SetData(const Track &track, u32 buffer, u32 readSize, u32 bufferSize, u32 fileSize, int outputChannels, bool isAA3) override; int SetSecondBuffer(u32 secondBuffer, u32 secondBufferSize) override; bool HasSecondBuffer() const override; diff --git a/Core/HLE/ErrorCodes.h b/Core/HLE/ErrorCodes.h index 007aeaf46a..dabc91dc30 100644 --- a/Core/HLE/ErrorCodes.h +++ b/Core/HLE/ErrorCodes.h @@ -406,8 +406,10 @@ enum PSPErrorCode : u32 { SCE_ERROR_ATRAC_ALL_DATA_DECODED = 0x80630024, SCE_ERROR_ATRAC_IS_LOW_LEVEL = 0x80630031, SCE_ERROR_ATRAC_IS_FOR_SCESAS = 0x80630040, + SCE_ERROR_ATRAC_AA3_OTHER_FAILURE = 0x80631002, SCE_ERROR_ATRAC_AA3_INVALID_DATA = 0x80631003, SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL = 0x80631004, + SCE_ERROR_ATRAC_AA3_BAD_CODEC_PARAMS = 0x80631005, SCE_MPEG_ERROR_NO_DATA = 0x80618001, SCE_MPEG_ERROR_BAD_VERSION = 0x80610002, diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index c0d14ad83f..a64f1f6b5c 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -669,7 +669,7 @@ static u32 sceAtracSetHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u32 b return hleLogError(Log::Atrac, SCE_ERROR_ATRAC_WRONG_CODECTYPE, "atracID uses different codec type than data"); } - ret = atrac->SetData(track, buffer, readSize, bufferSize, 2); + ret = atrac->SetData(track, buffer, readSize, bufferSize, 0, 2, false); if (ret < 0) { // Must not delay. return hleLogError(Log::Atrac, ret); @@ -705,7 +705,7 @@ static u32 sceAtracSetData(int atracID, u32 buffer, u32 bufferSize) { return hleLogError(Log::Atrac, SCE_ERROR_ATRAC_WRONG_CODECTYPE, "atracID uses different codec type than data"); } - ret = atrac->SetData(track, buffer, bufferSize, bufferSize, 2); + ret = atrac->SetData(track, buffer, bufferSize, bufferSize, 0, 2, false); if (ret < 0) { // Must not delay. return hleLogError(Log::Atrac, ret); @@ -736,7 +736,7 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) { return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, 2); + ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, 0, 2, false); if (ret < 0) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); @@ -762,7 +762,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buffer return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, 2); + ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, 0, 2, false); if (ret < 0) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); @@ -877,7 +877,7 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u return hleLogError(Log::Atrac, ret, "%s", error.c_str()); } - ret = atrac->SetData(track, buffer, readSize, bufferSize, 1); + ret = atrac->SetData(track, buffer, readSize, bufferSize, 1, 0, false); if (ret < 0 && ret != SCE_ERROR_ATRAC_NOT_MONO) { // Must not delay. return hleLogError(Log::Atrac, ret); @@ -902,7 +902,7 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) { return hleLogError(Log::Atrac, ret, "%s", error.c_str()); } - ret = atrac->SetData(track, buffer, bufferSize, bufferSize, 1); + ret = atrac->SetData(track, buffer, bufferSize, bufferSize, 1, 0, false); if (ret < 0 && ret != SCE_ERROR_ATRAC_NOT_MONO) { // Must not delay. return hleLogError(Log::Atrac, ret); @@ -930,7 +930,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) { return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, 1); + ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, 0, 1, false); if (ret < 0 && ret != SCE_ERROR_ATRAC_NOT_MONO) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); @@ -959,7 +959,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 bu return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, 1); + ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, 0, 1, false); if (ret < 0 && ret != SCE_ERROR_ATRAC_NOT_MONO) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); @@ -980,7 +980,7 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, 2); + ret = atracContexts[atracID]->SetData(track, buffer, bufferSize, bufferSize, fileSize, 2, true); if (ret < 0) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); @@ -1006,7 +1006,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 buffer, u32 readSize, u32 buf return hleLogError(Log::Atrac, atracID, "no free ID"); } - ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, 2); + ret = atracContexts[atracID]->SetData(track, buffer, readSize, bufferSize, fileSize, 2, true); if (ret < 0) { UnregisterAndDeleteAtrac(atracID); return hleLogError(Log::Atrac, ret); diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 9b20f85817..97d55fff8a 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -1416,6 +1416,7 @@ const char *KernelErrorToString(u32 err) { case SCE_ERROR_ATRAC_IS_FOR_SCESAS: return "SCE_ERROR_ATRAC_IS_FOR_SCESAS"; case SCE_ERROR_ATRAC_AA3_INVALID_DATA: return "SCE_ERROR_ATRAC_AA3_INVALID_DATA"; case SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL: return "SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL"; + case SCE_ERROR_ATRAC_AA3_BAD_CODEC_PARAMS: return "SCE_ERROR_ATRAC_AA3_BAD_CODEC_PARAMS"; case SCE_ERROR_ATRAC_BAD_ALIGNMENT: return "SCE_ERROR_ATRAC_BAD_ALIGNMENT"; case SCE_MPEG_ERROR_BAD_VERSION: return "SCE_MPEG_ERROR_BAD_VERSION"; diff --git a/Core/Util/AtracTrack.cpp b/Core/Util/AtracTrack.cpp index f2a00fd5f9..93281a7e3c 100644 --- a/Core/Util/AtracTrack.cpp +++ b/Core/Util/AtracTrack.cpp @@ -358,7 +358,7 @@ int ParseWaveAT3(const u8 *data, int dataLength, TrackInfo *track) { track->waveDataSize = 0; int retval = SCE_ERROR_ATRAC_UNKNOWN_FORMAT; - int offset = 0; // byte offset into the data array. Is kept even. + int offset = 0; // u8 offset into the data array. Is kept even. // Scan RIFF chunks for the RIFFWAVE header. Normally we find this immediately. while (true) { @@ -537,3 +537,140 @@ int ParseWaveAT3(const u8 *data, int dataLength, TrackInfo *track) { offset = nextOffset; } } + +struct AA3Info { + int tagSize; + int dataOff; + int extraBytes; + u8 codecType; // 1 == at3plus + u32 codecParams; + u32 waveDataSize; +}; + +static u16 ParseU16BE(const u8 *data, int *offset) { + const u16 value = (data[*offset] << 8) | data[*offset + 1]; + *offset += 2; + return value; +} + +static u32 Parse3BytesBE(const u8 *data, int *offset) { + const u32 id = (data[*offset] << 16) | (data[*offset + 1] << 8) | data[*offset + 2]; + *offset += 3; + return id; +} + +static u32 Parse28BitIntBE(const u8 *data, int *offset) { + const u32 value = ((data[*offset] & 0x7F) << 21) | ((data[*offset + 1] & 0x7F) << 14) | ((data[*offset + 2] & 0x7F) << 7) | (data[*offset + 3] & 0x7F); + *offset += 4; + return value; +} + +static u32 Parse4BytesBE(const u8 *data, int *offset) { + const u32 value = (data[*offset] << 24) | (data[*offset + 1] << 16) | (data[*offset + 2] << 8) | data[*offset + 3]; + *offset += 4; + return value; +} + +static u32 ParseAA3Headers(int readSize, AA3Info *info, int fileSize, const u8 *aa3Data) { + if ((u32)readSize < 9) { + return SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL; + } + int offset = 0; + const u32 id = Parse3BytesBE(aa3Data, &offset); + if (id == 0x656133 || id == 0x494433) { // "ea3" or "id3" + const u8 *dataPtr = aa3Data + offset; + if ((*dataPtr != 3) || (offset = offset + 3, dataPtr[1] != 0)) { + return SCE_ERROR_ATRAC_AA3_OTHER_FAILURE; + } + info->tagSize = Parse28BitIntBE(aa3Data, &offset); + if (info->tagSize == 0xffffffff) { + return SCE_ERROR_ATRAC_AA3_INVALID_DATA; + } + offset += info->tagSize; + if (offset >= readSize) { + return SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL; + } + if (aa3Data[offset] == 0) { + offset += 0x10; + } + info->dataOff = offset; + } else { + // Might be that the file just starts with the EA3 header. + info->tagSize = 0; + info->dataOff = 0; + offset = 0; + } + + if (offset + 0x22 > readSize) { + return SCE_ERROR_ATRAC_AA3_SIZE_TOO_SMALL; + } + if (Parse3BytesBE(aa3Data, &offset) != 0x454133) { + return SCE_ERROR_ATRAC_AA3_INVALID_DATA; + } + + offset++; + info->extraBytes = ParseU16BE(aa3Data, &offset);; + if (ParseU16BE(aa3Data, &offset) != 0xffff) { + return SCE_ERROR_ATRAC_AA3_INVALID_DATA; + } + + offset += 24; + info->codecType = aa3Data[offset]; + + u32 codec; + switch (info->codecType) { + case 0: codec = PSP_CODEC_AT3; break; + case 1: codec = PSP_CODEC_AT3PLUS; break; + default: return SCE_ERROR_ATRAC_AA3_INVALID_DATA; + } + + info->codecParams = Parse4BytesBE(aa3Data, &offset); + const u32 dataOff = info->dataOff + info->extraBytes; + info->waveDataSize = fileSize - dataOff; + info->dataOff = dataOff; + return codec; +} + +static int ConvertAA3InfoToTrackInfo(const AA3Info *in, TrackInfo *out) { + out->loopEnd = 0xffffffff; + out->loopStart = 0xffffffff; + out->waveDataSize = in->waveDataSize; + out->dataOff = in->dataOff; + out->numChans = 2; + out->endSample = 0; + const u32 codecParams = in->codecParams; + if (in->codecType == 0) { + if ((codecParams & 0xe000) != 0x2000) { + return SCE_ERROR_ATRAC_AA3_BAD_CODEC_PARAMS; + } + out->firstSampleOffset = 0x400; + out->blockAlign = (u16)((codecParams & 0x3ff) << 3); + if ((codecParams & 0x20000) == 0) { + out->sampleSizeMaybe = 0; + } else { + out->sampleSizeMaybe = 1; + } + out->tailFlag = 0; + return PSP_CODEC_AT3; + } else if (in->codecType == 1) { + if ((codecParams & 0x1c00) != 0x800 || (codecParams & 0xe000) != 0x2000) { + return SCE_ERROR_ATRAC_AA3_BAD_CODEC_PARAMS; + } + out->firstSampleOffset = 0x800; + out->blockAlign = ((u16)codecParams & 0x3ff) * 8 + 8; + out->sampleSizeMaybe = (u8)(((codecParams >> 8) & 0x3) | 0x28); + out->tailFlag = codecParams & 0xFF; + return PSP_CODEC_AT3PLUS; + } else { + return SCE_ERROR_ATRAC_AA3_INVALID_DATA; + } +} + +int ParseAA3(const u8 *buffer, int readSize, int fileSize, TrackInfo *track) { + AA3Info info; + int retval = ParseAA3Headers(readSize, &info, fileSize, buffer); + if (retval < 0) { + return retval; + } + return ConvertAA3InfoToTrackInfo(&info, track); +} diff --git a/Core/Util/AtracTrack.h b/Core/Util/AtracTrack.h index 5090d61f00..d448e06958 100644 --- a/Core/Util/AtracTrack.h +++ b/Core/Util/AtracTrack.h @@ -122,3 +122,4 @@ struct TrackInfo { }; int ParseWaveAT3(const u8 *data, int length, TrackInfo *track); +int ParseAA3(const u8 *data, int readSize, int fileSize, TrackInfo *track);