marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't malloc/free for every mixing operation, use the same buffer over 

instead...
oldstable
Ove Kaaven 1999-04-24 11:53:38 +00:00 committed by Alexandre Julliard
parent 60e414fb65
commit 819791ba0a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
multimedia/dsound.c
View File

@ -1935,6 +1935,22 @@ static void DSOUND_Mixer3D(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len)
} }
#endif #endif
static void *tmp_buffer;
static size_t tmp_buffer_len = 0;
static void *DSOUND_tmpbuffer(size_t len)
{
if (len>tmp_buffer_len) {
void *new_buffer = realloc(tmp_buffer, len);
if (new_buffer) {
tmp_buffer = new_buffer;
tmp_buffer_len = len;
}
return new_buffer;
}
return tmp_buffer;
}
static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb) static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb)
{ {
INT i, len, ilen, temp, field; INT i, len, ilen, temp, field;
@ -1968,7 +1984,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb)
/* Been seeing segfaults in malloc() for some reason... */ /* Been seeing segfaults in malloc() for some reason... */
TRACE(dsound, "allocating buffer (size = %d)\n", len); TRACE(dsound, "allocating buffer (size = %d)\n", len);
if ((buf = ibuf = (BYTE *) malloc(len)) == NULL) if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL)
return 0; return 0;
TRACE(dsound, "MixInBuffer (%p) len = %d\n", dsb, len); TRACE(dsound, "MixInBuffer (%p) len = %d\n", dsb, len);
@ -2002,7 +2018,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb)
if (obuf >= (BYTE *)(primarybuf->buffer + primarybuf->buflen)) if (obuf >= (BYTE *)(primarybuf->buffer + primarybuf->buflen))
obuf = primarybuf->buffer; obuf = primarybuf->buffer;
} }
free(buf); /* free(buf); */
if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY) if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY)
DSOUND_CheckEvent(dsb, ilen); DSOUND_CheckEvent(dsb, ilen);