MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WAVs looping fix. But broke other formats looping

Browse Source
This commit is contained in:
veins1 2022-07-17 03:25:07 +05:00 committed by GitHub
parent 49a534b5d4
commit 38d46e0a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/raudio.c
View File

@ -1725,7 +1725,8 @@ void UpdateMusicStream(Music music)
unsigned int subBufferSizeInFrames = music.stream.buffer->sizeInFrames/2; unsigned int subBufferSizeInFrames = music.stream.buffer->sizeInFrames/2;
// On first call of this function we lazily pre-allocated a temp buffer to read audio files/memory data in // On first call of this function we lazily pre-allocated a temp buffer to read audio files/memory data in
unsigned int pcmSize = subBufferSizeInFrames*music.stream.channels*music.stream.sampleSize/8; int frameSize = music.stream.channels * music.stream.sampleSize / 8;
unsigned int pcmSize = subBufferSizeInFrames*frameSize;
if (AUDIO.System.pcmBufferSize < pcmSize) if (AUDIO.System.pcmBufferSize < pcmSize)
{ {
RL_FREE(AUDIO.System.pcmBuffer); RL_FREE(AUDIO.System.pcmBuffer);
@ -1735,43 +1736,57 @@ void UpdateMusicStream(Music music)
int framesLeft = music.frameCount - music.stream.buffer->framesProcessed; // Frames left to be processed int framesLeft = music.frameCount - music.stream.buffer->framesProcessed; // Frames left to be processed
int framesToStream = 0; // Total frames to be streamed int framesToStream = 0; // Total frames to be streamed
unsigned int framesLoopingExtra = 0; // In case music requires to loop, we could need to add more frames from beginning to fill buffer
// Check both sub-buffers to check if they require refilling // Check both sub-buffers to check if they require refilling
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
if ((music.stream.buffer != NULL) && !music.stream.buffer->isSubBufferProcessed[i]) continue; // No refilling required, move to next sub-buffer if ((music.stream.buffer != NULL) && !music.stream.buffer->isSubBufferProcessed[i]) continue; // No refilling required, move to next sub-buffer
if (music.looping) {
framesToStream = subBufferSizeInFrames;
}
else {
if (framesLeft >= subBufferSizeInFrames) framesToStream = subBufferSizeInFrames; if (framesLeft >= subBufferSizeInFrames) framesToStream = subBufferSizeInFrames;
else else
{ {
framesToStream = framesLeft; framesToStream = framesLeft;
}
// WARNING: If audio needs to loop but the frames left are less than the actual size of buffer to fill,
// the buffer is only partially filled and no refill is done until next frame call, generating a silence
// SOLUTION: In case of music loop, fill frames left + frames from start to fill the buffer to process
if (music.looping) framesLoopingExtra = subBufferSizeInFrames - framesLeft;
} }
int frameCountStillNeeded = framesToStream;
int frameCountRedTotal = 0;
switch (music.ctxType) switch (music.ctxType)
{ {
#if defined(SUPPORT_FILEFORMAT_WAV) #if defined(SUPPORT_FILEFORMAT_WAV)
case MUSIC_AUDIO_WAV: case MUSIC_AUDIO_WAV:
{ {
// NOTE: Returns the number of samples to process (not required) // NOTE: Returns the number of samples to process (not required)
if (music.stream.sampleSize == 16) drwav_read_pcm_frames_s16((drwav *)music.ctxData, framesToStream, (short *)AUDIO.System.pcmBuffer); if (music.stream.sampleSize == 16) {
else if (music.stream.sampleSize == 32) drwav_read_pcm_frames_f32((drwav *)music.ctxData, framesToStream, (float *)AUDIO.System.pcmBuffer); while (true) {
int frameCountRed = drwav_read_pcm_frames_s16((drwav*)music.ctxData, frameCountStillNeeded, (short*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize));
if (framesLoopingExtra > 0) frameCountRedTotal += frameCountRed;
{ frameCountStillNeeded -= frameCountRed;
drwav_seek_to_pcm_frame((drwav *)music.ctxData, 0); if (frameCountStillNeeded == 0) {
break;
if (music.stream.sampleSize == 16) drwav_read_pcm_frames_s16((drwav *)music.ctxData, framesLoopingExtra, (short *)AUDIO.System.pcmBuffer + framesToStream*music.stream.channels); }
else if (music.stream.sampleSize == 32) drwav_read_pcm_frames_f32((drwav *)music.ctxData, framesLoopingExtra, (float *)AUDIO.System.pcmBuffer + framesToStream*music.stream.channels); else {
drwav_seek_to_pcm_frame((drwav*)music.ctxData, 0);
framesToStream += framesLoopingExtra; }
}
}
else if (music.stream.sampleSize == 32) {
while (true) {
int frameCountRed = drwav_read_pcm_frames_f32((drwav*)music.ctxData, frameCountStillNeeded, (float*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize));
frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) {
break;
}
else {
drwav_seek_to_pcm_frame((drwav*)music.ctxData, 0);
}
}
} }
} break; } break;
#endif #endif
#if defined(SUPPORT_FILEFORMAT_OGG) #if defined(SUPPORT_FILEFORMAT_OGG)
@ -1841,16 +1856,10 @@ void UpdateMusicStream(Music music)
// Reset audio stream for looping // Reset audio stream for looping
if (streamEnding) if (streamEnding)
{ {
if (music.looping) if (!music.looping)
{ {
PlayMusicStream(music); // Play again StopMusicStream(music);
// Set cursor offset to extra frames filled previously
music.stream.buffer->frameCursorPos = framesLoopingExtra;
// TODO: It's not working properly... :(
} }
else StopMusicStream(music); // Stop music (and reset)
} }
else else
{ {