mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-18 11:54:30 +01:00
Merge pull request #20662 from hrydgard/aa3-fix
Atrac3+: Fix parsing for the AA3 file format
This commit is contained in:
10 files changed
+172
-24
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+14
-7
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
+12
-12
@@ -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);
|
||||
@@ -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());
|
||||
}
|
||||
@@ -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);
|
||||
@@ -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());
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
+138
-1
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
Reference in new issue
Block a user