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

output/PipeWire: after Cancel(), refill buffer before resuming playback 

Deactivate the stream in Cancel().  This fixes stuttering after a
manual song change by refilling the whole ring buffer before
reactivating the stream.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1354
This commit is contained in:
Max Kellermann 2022-07-09 00:59:35 +02:00
parent 547a084c7e
commit c8dae95eff
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -7,6 +7,7 @@ ver 0.23.8 (not yet released)
- cdio_paranoia: don't scan for replay gain tags - cdio_paranoia: don't scan for replay gain tags
- pipewire: fix playback of very short tracks - pipewire: fix playback of very short tracks
- pipewire: drop all buffers before manual song change - pipewire: drop all buffers before manual song change
- pipewire: fix stuttering after manual song change
- snapcast: fix busy loop while paused - snapcast: fix busy loop while paused
- snapcast: fix stuttering after resuming playback - snapcast: fix stuttering after resuming playback
* mixer * mixer

9
src/output/plugins/PipeWireOutputPlugin.cxx
View File

@ -901,6 +901,15 @@ PipeWireOutput::Cancel() noexcept
/* clear libpipewire's buffer */ /* clear libpipewire's buffer */
pw_stream_flush(stream, false); pw_stream_flush(stream, false);
drained = true; drained = true;
/* pause the PipeWire stream so libpipewire ceases invoking
the "process" callback (we have no data until our Play()
method gets called again); the stream will be resume by
Play() after the ring_buffer has been refilled */
if (active) {
active = false;
pw_stream_set_active(stream, false);
}
} }
bool bool