From 6fbf3c40550fb9524b6a58e62ea47afaf63bc97b Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 29 Apr 2009 15:23:37 +0000 Subject: [PATCH] snd_sdl.c: lock the render buffer before running the threaded sound mixer git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8941 d7cf8633-e32d-0410-b094-e92efae38249 --- snd_sdl.c | 62 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/snd_sdl.c b/snd_sdl.c index 667d56b3..32990af8 100644 --- a/snd_sdl.c +++ b/snd_sdl.c @@ -39,41 +39,47 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len) RequestedFrames = (unsigned int)len / factor; - if (snd_usethreadedmixing) + if (SndSys_LockRenderBuffer()) { - S_MixToBuffer(stream, RequestedFrames); - if (snd_blocked) - memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len); - return; - } + if (snd_usethreadedmixing) + { + S_MixToBuffer(stream, RequestedFrames); + if (snd_blocked) + memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len); + SndSys_UnlockRenderBuffer(); + return; + } - // Transfert up to a chunk of samples from snd_renderbuffer to stream - MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe; - if (MaxFrames > RequestedFrames) - FrameCount = RequestedFrames; - else - FrameCount = MaxFrames; - StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; - EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes; - if (StartOffset > EndOffset) // if the buffer wraps - { - unsigned int PartialLength1, PartialLength2; + // Transfert up to a chunk of samples from snd_renderbuffer to stream + MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe; + if (MaxFrames > RequestedFrames) + FrameCount = RequestedFrames; + else + FrameCount = MaxFrames; + StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; + EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes; + if (StartOffset > EndOffset) // if the buffer wraps + { + unsigned int PartialLength1, PartialLength2; - PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor; - memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1); + PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor; + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1); - PartialLength2 = FrameCount * factor - PartialLength1; - memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); - } - else - memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); + PartialLength2 = FrameCount * factor - PartialLength1; + memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); + } + else + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); - snd_renderbuffer->startframe += FrameCount; + snd_renderbuffer->startframe += FrameCount; - if (FrameCount < RequestedFrames && developer.integer >= 1000 && vid_activewindow) - Con_Printf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount); + if (FrameCount < RequestedFrames && developer.integer >= 1000 && vid_activewindow) + Con_Printf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount); - sdlaudiotime += RequestedFrames; + sdlaudiotime += RequestedFrames; + + SndSys_UnlockRenderBuffer(); + } } -- 2.39.2