ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MSU-1 audio memory leak

This commit is contained in:
qwertymodo 2017-08-30 17:59:39 -07:00
parent 03bdbe08fb
commit b230e50ec5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apu/apu.cpp
View File

@ -245,6 +245,8 @@ namespace msu
static int buffer_size; static int buffer_size;
static uint8 *landing_buffer = NULL; static uint8 *landing_buffer = NULL;
static Resampler *resampler = NULL; static Resampler *resampler = NULL;
static int resample_buffer_size = -1;
static uint8 *resample_buffer = NULL;
} }
static void EightBitize (uint8 *, int); static void EightBitize (uint8 *, int);
@ -314,6 +316,13 @@ bool8 S9xMixSamples (uint8 *buffer, int sample_count)
else else
dest = buffer; dest = buffer;
if (Settings.MSU1 && msu::resample_buffer_size < (sample_count << 1))
{
delete[] msu::resample_buffer;
msu::resample_buffer = new uint8[sample_count << 1];
msu::resample_buffer_size = sample_count << 1;
}
if (Settings.Mute) if (Settings.Mute)
{ {
memset(dest, 0, sample_count << 1); memset(dest, 0, sample_count << 1);
@ -336,10 +345,9 @@ bool8 S9xMixSamples (uint8 *buffer, int sample_count)
{ {
if (msu::resampler->avail() >= sample_count) if (msu::resampler->avail() >= sample_count)
{ {
uint8 *msu_sample = new uint8[sample_count * 2]; msu::resampler->read((short *)msu::resample_buffer, sample_count);
msu::resampler->read((short *)msu_sample, sample_count);
for (uint32 i = 0; i < sample_count; ++i) for (uint32 i = 0; i < sample_count; ++i)
*((int16*)(dest+(i * 2))) += *((int16*)(msu_sample+(i * 2))); *((int16*)(dest+(i * 2))) += *((int16*)(msu::resample_buffer +(i * 2)));
} }
} }
} }
@ -603,6 +611,12 @@ void S9xDeinitAPU (void)
delete[] msu::landing_buffer; delete[] msu::landing_buffer;
msu::landing_buffer = NULL; msu::landing_buffer = NULL;
} }
if (msu::resample_buffer)
{
delete[] msu::resample_buffer;
msu::resample_buffer = NULL;
}
} }
static inline int S9xAPUGetClock (int32 cpucycles) static inline int S9xAPUGetClock (int32 cpucycles)