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

Merge pull request #19056 from hrydgard/atrac-refactor

Browse Source 
Atrac: Refactor: Move a lot more code into the Atrac class
This commit is contained in:
Henrik Rydgård 2024-04-14 13:03:43 +02:00 committed by GitHub
commit bfe5ef00a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 383 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

719
Core/HLE/sceAtrac.cpp
View File

File diff suppressed because it is too large Load Diff

11
Core/HLE/sceAtrac.h
View File

@ -25,6 +25,7 @@ void Register_sceAtrac3plus();
void __AtracInit();
void __AtracDoState(PointerWrap &p);
void __AtracShutdown();
void __AtracLoadModule(int version, u32 crc);
enum AtracStatus : u8 {
ATRAC_STATUS_NO_DATA = 1,
@ -84,9 +85,7 @@ struct SceAtracContext {
SceAtracIdInfo info;
};
// provide some decoder interface
u32 _AtracAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd);
u32 _AtracDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains);
int _AtracGetIDByContext(u32 contextAddr);
void __AtracLoadModule(int version, u32 crc);
// External interface used by sceSas.
u32 AtracSasAddStreamData(int atracID, u32 bufPtr, u32 bytesToAdd);
u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum, u32* finish, int *remains);
int AtracSasGetIDByContext(u32 contextAddr);

6
Core/HW/SasAudio.cpp
View File

@ -192,7 +192,7 @@ void VagDecoder::DoState(PointerWrap &p) {
int SasAtrac3::setContext(u32 context) {
contextAddr_ = context;
atracID_ = _AtracGetIDByContext(context);
atracID_ = AtracSasGetIDByContext(context);
if (!sampleQueue_)
sampleQueue_ = new BufferQueue();
sampleQueue_->clear();
@ -211,7 +211,7 @@ void SasAtrac3::getNextSamples(s16 *outbuf, int wantedSamples) {
u32 numSamples = 0;
int remains = 0;
static s16 buf[0x800];
_AtracDecodeData(atracID_, (u8*)buf, 0, &numSamples, &finish, &remains);
AtracSasDecodeData(atracID_, (u8*)buf, 0, &numSamples, &finish, &remains);
if (numSamples > 0)
sampleQueue_->push((u8*)buf, numSamples * sizeof(s16));
else
@ -223,7 +223,7 @@ void SasAtrac3::getNextSamples(s16 *outbuf, int wantedSamples) {
int SasAtrac3::addStreamData(u32 bufPtr, u32 addbytes) {
if (atracID_ > 0) {
_AtracAddStreamData(atracID_, bufPtr, addbytes);
AtracSasAddStreamData(atracID_, bufPtr, addbytes);
}
return 0;
}