From 24e088daa8266cdd6947ed9067ebe473cbde9cd6 Mon Sep 17 00:00:00 2001 From: Oleg Dubinskiy Date: Wed, 24 Apr 2024 11:08:40 +0200 Subject: [PATCH] [MMEBUDDY] Implement support for looped wave playback (#6761) Fix playing wave header multiple times in case the caller requests to do it. In Windows, it is supported by WHDR_BEGINLOOP and WHDR_ENDLOOP flags (specified together) and dwLoops member of WAVEHDR structure (ususally set to 0xFFFFFFFF (INFINITE constant)). - Check whenther WHDR_BEGINLOOP | WHDR_ENDLOOP flags are set by the caller. - If they are, get the amount of times to play the header from WAVEHDR.dwLoops. - Perform wave header competion only when the loop count is equal to zero. Otherwise, don't do it. - When the header is entirely committed, in case completion is not needed, reset committed bytes count to the starting value to allow the header play again. - Decrement loop count in case it isn't set to INFINITE, to mark loop as played correctly. When this count becomes zero, then the playback is finished. - Get rid from SOUND_OVERLAPPED.PerformCompletion member. Use SOUND_DEVICE_INSTANCE.LoopsRemaining == 0 condition instead. - Do this only for WaveOut devices, since MSDN states it works only with output buffers. Hence, there is nothing changed for WaveIn. - Update an appropriate statement about unimplemented functionality from mmebuddy notes. TODO: handle the case when multiple headers are requested to be looped (WHDR_BEGINLOOP and WHDR_ENDLOOP are set separatedly: 1st flag - in the 1st header, and 2nd in the last header). Currently, only looping a single wave header is supported. This fixes the playback in the apps those request looped wave playback of some audio data (e. g., BRD Demo app, which did play its sound only first 500 ms before, now it plays endlessly until closing it manually). CORE-10118 --- sdk/include/reactos/libs/sound/mmebuddy.h | 1 - sdk/lib/drivers/sound/mmebuddy/readme.txt | 2 +- .../drivers/sound/mmebuddy/wave/streaming.c | 46 +++++++++++++++---- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/sdk/include/reactos/libs/sound/mmebuddy.h b/sdk/include/reactos/libs/sound/mmebuddy.h index d124e8bbc1d..4056621b181 100644 --- a/sdk/include/reactos/libs/sound/mmebuddy.h +++ b/sdk/include/reactos/libs/sound/mmebuddy.h @@ -120,7 +120,6 @@ typedef struct _SOUND_OVERLAPPED OVERLAPPED Standard; struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; PWAVEHDR Header; - BOOL PerformCompletion; LPOVERLAPPED_COMPLETION_ROUTINE OriginalCompletionRoutine; PVOID CompletionContext; diff --git a/sdk/lib/drivers/sound/mmebuddy/readme.txt b/sdk/lib/drivers/sound/mmebuddy/readme.txt index 91b52a78b63..a57127b8916 100644 --- a/sdk/lib/drivers/sound/mmebuddy/readme.txt +++ b/sdk/lib/drivers/sound/mmebuddy/readme.txt @@ -26,7 +26,7 @@ Unsupported MME messages: * Any not mentioned above Notes/Bugs: -* WHDR_BEGINLOOP and WHDR_ENDLOOP are ignored +* WHDR_BEGINLOOP and WHDR_ENDLOOP are not working for looping multiple wave headers, only for a single header. * Not possible to pause/restart playback diff --git a/sdk/lib/drivers/sound/mmebuddy/wave/streaming.c b/sdk/lib/drivers/sound/mmebuddy/wave/streaming.c index 3a4cabc9385..15a58cfd486 100644 --- a/sdk/lib/drivers/sound/mmebuddy/wave/streaming.c +++ b/sdk/lib/drivers/sound/mmebuddy/wave/streaming.c @@ -10,7 +10,6 @@ #include "precomp.h" - /* DoWaveStreaming Check if there is streaming to be done, and if so, do it. @@ -54,6 +53,22 @@ DoWaveStreaming( return; } + /* Do we need to loop a header? */ + if (DeviceType == WAVE_OUT_DEVICE_TYPE && (Header->dwFlags & WHDR_BEGINLOOP)) + { + if ((Header->dwFlags & WHDR_ENDLOOP)) + { + /* Get loop count */ + SoundDeviceInstance->LoopsRemaining = Header->dwLoops; + } + else + { + /* Report and help notice such a case */ + SND_WARN(L"Looping multiple headers is UNIMPLEMENTED. Will play once only\n"); + SND_ASSERT((Header->dwFlags & (WHDR_BEGINLOOP | WHDR_ENDLOOP)) == (WHDR_BEGINLOOP | WHDR_ENDLOOP)); + } + } + while ( ( SoundDeviceInstance->OutstandingBuffers < SoundDeviceInstance->BufferCount ) && ( Header ) && SoundDeviceInstance->ResetInProgress == FALSE) { @@ -106,10 +121,6 @@ DoWaveStreaming( Overlap->SoundDeviceInstance = SoundDeviceInstance; Overlap->Header = Header; - /* Don't complete this header if it's part of a loop */ - Overlap->PerformCompletion = TRUE; -// ( SoundDeviceInstance->LoopsRemaining > 0 ); - /* Adjust the commit-related counters */ HeaderExtension->BytesCommitted += BytesToCommit; ++ SoundDeviceInstance->OutstandingBuffers; @@ -189,8 +200,8 @@ CompleteIO( -- SoundDeviceInstance->OutstandingBuffers; /* Did we finish a WAVEHDR and aren't looping? */ - if ( HdrExtension->BytesCompleted + dwNumberOfBytesTransferred >= WaveHdr->dwBufferLength && - SoundOverlapped->PerformCompletion ) + if (HdrExtension->BytesCompleted + dwNumberOfBytesTransferred >= WaveHdr->dwBufferLength && + SoundDeviceInstance->LoopsRemaining == 0) { /* Wave buffer fully completed */ Bytes = WaveHdr->dwBufferLength - HdrExtension->BytesCompleted; @@ -203,9 +214,24 @@ CompleteIO( } else { - /* Partially completed */ - HdrExtension->BytesCompleted += dwNumberOfBytesTransferred; - SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); + /* Do we loop a header? */ + if (HdrExtension->BytesCommitted == WaveHdr->dwBufferLength && + SoundDeviceInstance->LoopsRemaining != 0) + { + /* Reset amount of bytes and decrement loop count, to play next iteration */ + HdrExtension->BytesCommitted = 0; + + if (SoundDeviceInstance->LoopsRemaining != INFINITE) + --SoundDeviceInstance->LoopsRemaining; + SND_TRACE(L"Looping the header, remaining loops %u\n", SoundDeviceInstance->LoopsRemaining); + } + else + { + /* Partially completed */ + HdrExtension->BytesCompleted += dwNumberOfBytesTransferred; + SND_TRACE(L"%u/%u bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); + } + break; }