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

Add DoState for sceAudiocodec

Browse source
This commit is contained in:
kaienfr 2014-03-27 15:10:53 +01:00
parent d4b9873872
commit 779d90b8c5
3 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Core/HLE/sceAudiocodec.cpp
View file

@ -35,7 +35,7 @@ struct AudioCodecContext {
}; };
// audioList is to store current playing audios. // audioList is to store current playing audios.
std::list<SimpleAudio *> audioList; static std::list<SimpleAudio *> audioList;
// find the audio decoder for corresponding ctxPtr in audioList // find the audio decoder for corresponding ctxPtr in audioList
SimpleAudio * findDecoder(u32 ctxPtr){ SimpleAudio * findDecoder(u32 ctxPtr){
@ -85,14 +85,11 @@ int sceAudiocodecDecode(u32 ctxPtr, int codec) {
int outbytes = 0; int outbytes = 0;
// find a decoder in audioList // find a decoder in audioList
auto decoder = findDecoder(ctxPtr); auto decoder = findDecoder(ctxPtr);
if (decoder == NULL){ if (decoder != NULL){
// create a decoder, this is possible when loadstate // Decode audio
decoder = new SimpleAudio(ctxPtr, codec); AudioDecode(decoder, Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &outbytes, Memory::GetPointer(ctx->outDataPtr));
audioList.push_front(decoder); DEBUG_LOG(ME, "sceAudiocodecDec(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec));
} }
// Decode audio
AudioDecode(decoder, Memory::GetPointer(ctx->inDataPtr), ctx->inDataSize, &outbytes, Memory::GetPointer(ctx->outDataPtr));
DEBUG_LOG(ME, "sceAudiocodecDec(%08x, %i (%s))", ctxPtr, codec, GetCodecName(codec));
// Delete AudioCodecContext // Delete AudioCodecContext
delete(ctx); delete(ctx);
return 0; return 0;
@ -117,7 +114,6 @@ int sceAudiocodecGetEDRAM(u32 ctxPtr, int codec) {
} }
int sceAudiocodecReleaseEDRAM(u32 ctxPtr, int id) { int sceAudiocodecReleaseEDRAM(u32 ctxPtr, int id) {
//id is not always a codec, so what is should be?
if (removeDecoder(ctxPtr)){ if (removeDecoder(ctxPtr)){
INFO_LOG(ME, "sceAudiocodecReleaseEDRAM(%08x, %i)", ctxPtr, id); INFO_LOG(ME, "sceAudiocodecReleaseEDRAM(%08x, %i)", ctxPtr, id);
return 0; return 0;
@ -141,6 +137,45 @@ void Register_sceAudiocodec()
RegisterModule("sceAudiocodec", ARRAY_SIZE(sceAudiocodec), sceAudiocodec); RegisterModule("sceAudiocodec", ARRAY_SIZE(sceAudiocodec), sceAudiocodec);
} }
void __sceAudiocodecDoState(PointerWrap &p){
auto s = p.Section("AudioList", 0, 1);
if (!s)
return;
auto count = (int)audioList.size();
p.Do(count);
if (count > 0){
if (p.mode == p.MODE_READ){
// loadstate if audioList is nonempty
auto codec_ = new int[count];
auto ctxPtr_ = new u32[count];
p.DoArray(codec_, ARRAY_SIZE(codec_));
p.DoArray(ctxPtr_, ARRAY_SIZE(ctxPtr_));
for (int i = 0; i < count; i++){
auto decoder = new SimpleAudio(ctxPtr_[i], codec_[i]);
audioList.push_front(decoder);
}
delete[] codec_;
delete[] ctxPtr_;
}
else{
// savestate if audioList is nonempty
auto codec_ = new int[count];
auto ctxPtr_ = new u32[count];
int i = 0;
for (std::list<SimpleAudio *>::iterator it = audioList.begin(); it != audioList.end(); it++){
codec_[i] = (*it)->audioType;
ctxPtr_[i] = (*it)->ctxPtr;
i++;
}
p.DoArray(codec_, ARRAY_SIZE(codec_));
p.DoArray(ctxPtr_, ARRAY_SIZE(ctxPtr_));
delete[] codec_;
delete[] ctxPtr_;
}
}
}
void resetAudioList(){ void resetAudioList(){
audioList.clear(); audioList.clear();
INFO_LOG(ME, "Audio playing list is reset"); INFO_LOG(ME, "Audio playing list is reset");

1
Core/HLE/sceAudiocodec.h
View file

@ -58,3 +58,4 @@ typedef struct
void Register_sceAudiocodec(); void Register_sceAudiocodec();
void resetAudioList(); void resetAudioList();
void __sceAudiocodecDoState(PointerWrap &p);

1
Core/HLE/sceKernel.cpp
View file

@ -257,6 +257,7 @@ void __KernelDoState(PointerWrap &p)
__PPGeDoState(p); __PPGeDoState(p);
__CheatDoState(p); __CheatDoState(p);
__sceAudiocodecDoState(p);
} }
{ {