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

Fix some glitches in the new AA3 handling.

Browse source 
Matches a test better.
This commit is contained in:
Unknown W. Brackets 2015-01-04 16:26:42 -08:00
parent a9b010b0cd
commit 61d43f1616
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Core/HLE/sceAtrac.cpp
View file

@ -64,6 +64,8 @@
#define ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED 0x80630022 #define ATRAC_ERROR_SECOND_BUFFER_NOT_NEEDED 0x80630022
#define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023 #define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023
#define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024 #define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024
#define ATRAC_ERROR_AA3_INVALID_DATA 0x80631003
#define ATRAC_ERROR_AA3_SIZE_TOO_SMALL 0x80631004
#define AT3_MAGIC 0x0270 #define AT3_MAGIC 0x0270
#define AT3_PLUS_MAGIC 0xFFFE #define AT3_PLUS_MAGIC 0xFFFE
@ -629,22 +631,27 @@ int Atrac::Analyze() {
int Atrac::AnalyzeAA3() { int Atrac::AnalyzeAA3() {
AnalyzeReset(); AnalyzeReset();
if (first.size < 10) {
return ATRAC_ERROR_AA3_SIZE_TOO_SMALL;
}
// TODO: Make sure this validation is correct, more testing. // TODO: Make sure this validation is correct, more testing.
const u8 *buffer = Memory::GetPointer(first.addr); const u8 *buffer = Memory::GetPointer(first.addr);
if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') { if (buffer[0] != 'e' || buffer[1] != 'a' || buffer[2] != '3') {
// TODO: Error code. return ATRAC_ERROR_AA3_INVALID_DATA;
return -1;
} }
// It starts with an id3 header (replaced with ea3.) This is the size. // It starts with an id3 header (replaced with ea3.) This is the size.
u32 tagSize = buffer[9] | (buffer[8] << 7) | (buffer[7] << 14) | (buffer[6] << 21); u32 tagSize = buffer[9] | (buffer[8] << 7) | (buffer[7] << 14) | (buffer[6] << 21);
if (first.size < tagSize + 36) {
return ATRAC_ERROR_AA3_SIZE_TOO_SMALL;
}
// EA3 header starts at id3 header (10) + tagSize. // EA3 header starts at id3 header (10) + tagSize.
buffer = Memory::GetPointer(first.addr + 10 + tagSize); buffer = Memory::GetPointer(first.addr + 10 + tagSize);
if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') { if (buffer[0] != 'E' || buffer[1] != 'A' || buffer[2] != '3') {
// TODO: Error code. return ATRAC_ERROR_AA3_INVALID_DATA;
return -1;
} }
// Based on FFmpeg's code. // Based on FFmpeg's code.
@ -662,16 +669,15 @@ int Atrac::AnalyzeAA3() {
codecType = PSP_MODE_AT_3_PLUS; codecType = PSP_MODE_AT_3_PLUS;
atracBytesPerFrame = ((codecParams & 0x03FF) * 8) + 8; atracBytesPerFrame = ((codecParams & 0x03FF) * 8) + 8;
atracBitrate = at3SampleRates[(codecParams >> 13) & 7] * atracBytesPerFrame * 8 / 2048; atracBitrate = at3SampleRates[(codecParams >> 13) & 7] * atracBytesPerFrame * 8 / 2048;
atracChannels = ((codecParams >> 10) & 7) + 1; atracChannels = (codecParams >> 10) & 7;
break; break;
case 3: case 3:
case 4: case 4:
case 5: case 5:
ERROR_LOG_REPORT(ME, "OMA header contains unsupported codec type: %d", buffer[32]); ERROR_LOG_REPORT(ME, "OMA header contains unsupported codec type: %d", buffer[32]);
return -1; return ATRAC_ERROR_AA3_INVALID_DATA;
default: default:
// TODO: Error code. return ATRAC_ERROR_AA3_INVALID_DATA;
return -1;
} }
dataOff = 0; dataOff = 0;
@ -1535,10 +1541,7 @@ static int sceAtracSetDataAndGetID(u32 buffer, int bufferSize) {
return atracID; return atracID;
} }
INFO_LOG(ME, "%d=sceAtracSetDataAndGetID(%08x, %08x)", atracID, buffer, bufferSize); INFO_LOG(ME, "%d=sceAtracSetDataAndGetID(%08x, %08x)", atracID, buffer, bufferSize);
ret = _AtracSetData(atracID, buffer, bufferSize, true); return _AtracSetData(atracID, buffer, bufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
static int sceAtracSetHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBufferSize) { static int sceAtracSetHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBufferSize) {
@ -1568,10 +1571,7 @@ static int sceAtracSetHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 ha
return atracID; return atracID;
} }
INFO_LOG(ME, "%d=sceAtracSetHalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize); INFO_LOG(ME, "%d=sceAtracSetHalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize);
ret = _AtracSetData(atracID, halfBuffer, halfBufferSize, true); return _AtracSetData(atracID, halfBuffer, halfBufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
static u32 sceAtracStartEntry() { static u32 sceAtracStartEntry() {
@ -1780,10 +1780,7 @@ static int sceAtracSetMOutDataAndGetID(u32 buffer, u32 bufferSize) {
} }
// This doesn't seem to be part of any available libatrac3plus library. // This doesn't seem to be part of any available libatrac3plus library.
WARN_LOG_REPORT(ME, "%d=sceAtracSetMOutDataAndGetID(%08x, %08x)", atracID, buffer, bufferSize); WARN_LOG_REPORT(ME, "%d=sceAtracSetMOutDataAndGetID(%08x, %08x)", atracID, buffer, bufferSize);
ret = _AtracSetData(atracID, buffer, bufferSize, true); return _AtracSetData(atracID, buffer, bufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
static int sceAtracSetMOutHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBufferSize) { static int sceAtracSetMOutHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32 halfBufferSize) {
@ -1818,10 +1815,7 @@ static int sceAtracSetMOutHalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u3
return atracID; return atracID;
} }
INFO_LOG(ME, "%d=sceAtracSetMOutHalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize); INFO_LOG(ME, "%d=sceAtracSetMOutHalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize);
ret = _AtracSetData(atracID, halfBuffer, halfBufferSize, true); return _AtracSetData(atracID, halfBuffer, halfBufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) { static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize, u32 metadataSizeAddr) {
@ -1842,10 +1836,7 @@ static int sceAtracSetAA3DataAndGetID(u32 buffer, u32 bufferSize, u32 fileSize,
return atracID; return atracID;
} }
WARN_LOG(ME, "%d=sceAtracSetAA3DataAndGetID(%08x, %i, %i, %08x)", atracID, buffer, bufferSize, fileSize, metadataSizeAddr); WARN_LOG(ME, "%d=sceAtracSetAA3DataAndGetID(%08x, %i, %i, %08x)", atracID, buffer, bufferSize, fileSize, metadataSizeAddr);
ret = _AtracSetData(atracID, buffer, bufferSize); return _AtracSetData(atracID, buffer, bufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
int _AtracGetIDByContext(u32 contextAddr) { int _AtracGetIDByContext(u32 contextAddr) {
@ -2172,10 +2163,7 @@ static int sceAtracSetAA3HalfwayBufferAndGetID(u32 halfBuffer, u32 readSize, u32
return atracID; return atracID;
} }
ERROR_LOG(ME, "UNIMPL %d=sceAtracSetAA3HalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize); ERROR_LOG(ME, "UNIMPL %d=sceAtracSetAA3HalfwayBufferAndGetID(%08x, %08x, %08x)", atracID, halfBuffer, readSize, halfBufferSize);
ret = _AtracSetData(atrac, halfBuffer, halfBufferSize); return _AtracSetData(atracID, halfBuffer, halfBufferSize, true);
if (ret < 0)
return ret;
return atracID;
} }
const HLEFunction sceAtrac3plus[] = { const HLEFunction sceAtrac3plus[] = {