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

Clean up a leak in sceAudiocodec load state.

Browse source
This commit is contained in:
Unknown W. Brackets 2014-05-29 08:11:00 -07:00
parent d4c7922c25
commit a09f1fd80f
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Core/HLE/sceAudiocodec.cpp
View file

@ -41,9 +41,9 @@ static std::list<SimpleAudio *> audioList;
static bool oldStateLoaded = false;
// find the audio decoder for corresponding ctxPtr in audioList
SimpleAudio * findDecoder(u32 ctxPtr){
for (std::list<SimpleAudio *>::iterator it = audioList.begin(); it != audioList.end(); it++){
if ((*it)->ctxPtr == ctxPtr){
static SimpleAudio *findDecoder(u32 ctxPtr) {
for (auto it = audioList.begin(); it != audioList.end(); it++) {
if ((*it)->ctxPtr == ctxPtr) {
return (*it);
}
}
@ -51,9 +51,9 @@ SimpleAudio * findDecoder(u32 ctxPtr){
}
// remove decoder from audioList
bool removeDecoder(u32 ctxPtr){
for (std::list<SimpleAudio *>::iterator it = audioList.begin(); it != audioList.end(); it++){
if ((*it)->ctxPtr == ctxPtr){
static bool removeDecoder(u32 ctxPtr) {
for (auto it = audioList.begin(); it != audioList.end(); it++) {
if ((*it)->ctxPtr == ctxPtr) {
delete *it;
audioList.erase(it);
return true;
@ -62,16 +62,20 @@ bool removeDecoder(u32 ctxPtr){
return false;
}
static void clearDecoders() {
for (auto it = audioList.begin(); it != audioList.end(); it++) {
delete *it;
}
audioList.clear();
}
void __AudioCodecInit() {
oldStateLoaded = false;
}
void __AudioCodecShutdown() {
// We need to kill off any still opened codecs to not leak memory.
for (std::list<SimpleAudio *>::iterator it = audioList.begin(); it != audioList.end(); it++){
delete *it;
}
audioList.clear();
clearDecoders();
}
int sceAudiocodecInit(u32 ctxPtr, int codec) {
@ -170,6 +174,8 @@ void __sceAudiocodecDoState(PointerWrap &p){
if (count > 0) {
if (p.mode == PointerWrap::MODE_READ) {
clearDecoders();
// loadstate if audioList is nonempty
auto codec_ = new int[count];
auto ctxPtr_ = new u32[count];
@ -202,8 +208,3 @@ void __sceAudiocodecDoState(PointerWrap &p){
}
}
}
void resetAudioList(){
audioList.clear();
INFO_LOG(ME, "Audio playing list is reset");
}

1
Core/HLE/sceAudiocodec.h
View file

@ -59,5 +59,4 @@ typedef struct
void __AudioCodecInit();
void __AudioCodecShutdown();
void Register_sceAudiocodec();
void resetAudioList();
void __sceAudiocodecDoState(PointerWrap &p);

1
Core/System.cpp
View file

@ -418,7 +418,6 @@ void PSP_Shutdown() {
CPU_Shutdown();
}
GPU_Shutdown();
resetAudioList();
host->SetWindowTitle(0);
currentMIPS = 0;
pspIsInited = false;