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

Atrac: Use constants for the states, more clarity.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-10-10 18:12:29 -07:00
parent 310aa6ed47
commit 5177f16c8d
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/HLE/sceAtrac.cpp
View File

@ -1903,16 +1903,16 @@ void _AtracGenarateContext(Atrac *atrac, SceAtracId *context) {
// TODO: Should we just keep this in PSP ram then, or something?
} else if (!atrac->data_buf) {
// State 1, no buffer yet.
context->info.state = 1;
context->info.state = ATRAC_STATUS_NO_DATA;
} else if (atrac->first.size >= atrac->first.filesize) {
// state 2, all data loaded
context->info.state = 2;
context->info.state = ATRAC_STATUS_ALL_DATA_LOADED;
} else if (atrac->loopinfoNum == 0) {
// state 3, lack some data, no loop info
context->info.state = 3;
context->info.state = ATRAC_STATUS_STREAMED_WITHOUT_LOOP;
} else {
// state 6, lack some data, has loop info
context->info.state = 6;
context->info.state = ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER;
}
context->info.samplesPerChan = (atrac->codecType == PSP_MODE_AT_3_PLUS ? ATRAC3PLUS_MAX_SAMPLES : ATRAC3_MAX_SAMPLES);
context->info.sampleSize = atrac->atracBytesPerFrame;

22
Core/HLE/sceAtrac.h
View File

@ -26,6 +26,26 @@ void __AtracInit();
void __AtracDoState(PointerWrap &p);
void __AtracShutdown();
enum AtracStatus : u8 {
ATRAC_STATUS_NO_DATA = 1,
ATRAC_STATUS_ALL_DATA_LOADED = 2,
ATRAC_STATUS_HALFWAY_BUFFER = 3,
ATRAC_STATUS_STREAMED_WITHOUT_LOOP = 4,
ATRAC_STATUS_STREAMED_LOOP_FROM_END = 5,
// This means there's additional audio after the loop.
// i.e. ~~before loop~~ [ ~~this part loops~~ ] ~~after loop~~
// The "fork in the road" means a second buffer is needed for the second path.
ATRAC_STATUS_STREAMED_LOOP_WITH_TRAILER = 6,
ATRAC_STATUS_LOW_LEVEL = 8,
ATRAC_STATUS_FOR_SCESAS = 16,
};
#if COMMON_LITTLE_ENDIAN
typedef AtracStatus AtracStatus_le;
#else
typedef swap_struct_t<AtracStatus, swap_32_t<AtracStatus> > AtracStatus_le;
#endif
typedef struct
{
u32_le decodePos; // 0
@ -36,7 +56,7 @@ typedef struct
char numFrame; // 20
// 2: all the stream data on the buffer
// 6: looping -> second buffer needed
char state; // 21
AtracStatus_le state; // 21
char unk22;
char numChan; // 23
u16_le sampleSize; // 24