oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Thread: skip drain calls if there is no data to be played

Browse Source 
Keep track of whether there is data being played, and don't call
AudioOutput::Drain() after Cancel() has been called already.
This commit is contained in:
Max Kellermann 2021-02-15 16:15:27 +01:00
parent f1b8bcd6b2
commit efde78db77
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Control.hxx
View File

@ -181,6 +181,14 @@ class AudioOutputControl {
*/ */
bool open = false; bool open = false;
/**
* Is the device currently playing, i.e. is its buffer
* (likely) non-empty? If not, then it will never be drained.
*
* This field is only valid while the output is open.
*/
bool playing;
/** /**
* Is the device paused? i.e. the output thread is in the * Is the device paused? i.e. the output thread is in the
* ao_pause() loop. * ao_pause() loop.

14
src/output/Thread.cxx
View File

@ -53,7 +53,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
if (open && cf != output->filter_audio_format) if (open && cf != output->filter_audio_format)
/* if the filter's output format changes, the output /* if the filter's output format changes, the output
must be reopened as well */ must be reopened as well */
InternalCloseOutput(true); InternalCloseOutput(playing);
output->filter_audio_format = cf; output->filter_audio_format = cf;
@ -64,6 +64,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
} }
open = true; open = true;
playing = false;
} else if (in_audio_format != output->out_audio_format) { } else if (in_audio_format != output->out_audio_format) {
/* reconfigure the final ConvertFilter for its new /* reconfigure the final ConvertFilter for its new
input AudioFormat */ input AudioFormat */
@ -285,6 +286,9 @@ AudioOutputControl::PlayChunk(std::unique_lock<Mutex> &lock) noexcept
assert(nbytes % output->out_audio_format.GetFrameSize() == 0); assert(nbytes % output->out_audio_format.GetFrameSize() == 0);
source.ConsumeData(nbytes); source.ConsumeData(nbytes);
/* there's data to be drained from now on */
playing = true;
} }
return true; return true;
@ -371,6 +375,9 @@ AudioOutputControl::InternalPause(std::unique_lock<Mutex> &lock) noexcept
} }
skip_delay = true; skip_delay = true;
/* ignore drain commands until we got something new to play */
playing = false;
} }
static void static void
@ -390,6 +397,10 @@ PlayFull(FilteredAudioOutput &output, ConstBuffer<void> _buffer)
inline void inline void
AudioOutputControl::InternalDrain() noexcept AudioOutputControl::InternalDrain() noexcept
{ {
/* after this method finishes, there's nothing left to be
drained */
playing = false;
try { try {
/* flush the filter and play its remaining output */ /* flush the filter and play its remaining output */
@ -518,6 +529,7 @@ AudioOutputControl::Task() noexcept
source.Cancel(); source.Cancel();
if (open) { if (open) {
playing = false;
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
output->Cancel(); output->Cancel();
} }