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

Free mp3 contexts more carefully.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-10-24 19:12:44 -07:00
parent 9eda1fc578
commit 453628946f
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Core/HLE/sceMp3.cpp
View file

@ -41,10 +41,33 @@ extern "C" {
static const int MP3_BITRATES[] = {0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320};
struct Mp3Context {
Mp3Context()
:
#ifdef USE_FFMPEG
avformat_context(NULL), avio_context(NULL), resampler_context(NULL),
#endif
mediaengine(NULL) {
}
~Mp3Context() {
#ifdef USE_FFMPEG
if (avio_context != NULL) {
av_free(avio_context->buffer);
av_free(avio_context);
}
if (avformat_context != NULL) {
avformat_free_context(avformat_context);
}
if (resampler_context != NULL) {
swr_free(&resampler_context);
}
#endif
}
void DoState(PointerWrap &p) {
auto s = p.Section("Mp3Context", 1, 2);
if (!s)
return;
auto s = p.Section("Mp3Context", 1, 2);
if (!s)
return;
p.Do(mp3StreamStart);
p.Do(mp3StreamEnd);
@ -294,11 +317,6 @@ u32 sceMp3ReserveMp3Handle(u32 mp3Addr) {
ctx->mp3Bitrate = 128;
ctx->mp3SamplingRate = 44100;
#ifdef USE_FFMPEG
ctx->avformat_context = NULL;
ctx->avio_context = NULL;
#endif
mp3Map[mp3Addr] = ctx;
return mp3Addr;
}
@ -543,10 +561,6 @@ int sceMp3ReleaseMp3Handle(u32 mp3) {
return -1;
}
#ifdef USE_FFMPEG
av_free(ctx->avio_context->buffer);
av_free(ctx->avio_context);
#endif
mp3Map.erase(mp3Map.find(mp3));
delete ctx;