Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BFileGameSound: don't copy garbage after track end

Browse Source 
Check for the end of track, as the stream is repositioned on the first
frame, the start of which we were copying to the buffer if there was
space left, whether we were looping or not.

Solves #16592

Change-Id: Ic49d1776577b71a4451775876597b9c9003e1d35
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3411
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Máximo Castañeda 2020-11-23 18:57:20 +01:00 committed by Adrien Destugues
parent 15b8d49dba
commit 8c78892580
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kits/game/FileGameSound.cpp
View File

@ -249,12 +249,14 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount)
// Split or combine decoder buffers into mixer buffers
// fPlayPosition is where we got up to in the input buffer after last call
char* buffer = (char*)inBuffer;
size_t out_offset = 0;
while (inByteCount > 0 && !fPaused) {
if (!fPaused || fPausing) {
if (fPlayPosition == 0 || fPlayPosition >= fBufferSize) {
Load();
if (!Load())
break;
}
if (fPausing) {
@ -268,7 +270,6 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount)
}
// Fill the requested buffer, stopping if the paused flag is set
char* buffer = (char*)inBuffer;
switch(Format().format) {
case gs_audio_format::B_GS_U8:
@ -316,8 +317,6 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount)
Unlock();
} else {
char* buffer = (char*)inBuffer;
// Need to be able to stop asap when the pause flag is flipped.
while (fPlayPosition < fBufferSize && (!fPaused || fPausing)
&& (inByteCount > 0)) {
@ -327,6 +326,10 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount)
}
}
}
// Fill the rest with silence
if (inByteCount > 0)
memset(&buffer[out_offset], 0, inByteCount);
}
@ -478,6 +481,7 @@ BFileGameSound::Load()
fAudioStream->stream->SeekToFrame(&frame);
} else {
StopPlaying();
return false;
}
}