mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-10 13:30:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: always try to recycle a buffer

Browse source 
Also try to recycle a buffer if the current buffer_id is invalid.
Ignore -EPIPE from the sender, just ask for more data. -EPIPE is when
the sende runs out of buffers so in that case we need to recycle one
as well.

Fixes #2874
This commit is contained in:
Wim Taymans 2022-12-04 12:51:45 +01:00
parent dd420934ce
commit 5b371048df
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/stream.c
View file

@ -1002,6 +1002,7 @@ static int impl_node_process_input(void *object)
if (io->status == SPA_STATUS_HAVE_DATA && if (io->status == SPA_STATUS_HAVE_DATA &&
(b = get_buffer(stream, io->buffer_id)) != NULL) { (b = get_buffer(stream, io->buffer_id)) != NULL) {
/* push new buffer */ /* push new buffer */
pw_log_trace_fp("%p: push %d %p", stream, b->id, io);
if (queue_push(impl, &impl->dequeued, b) == 0) { if (queue_push(impl, &impl->dequeued, b) == 0) {
copy_position(impl, impl->dequeued.incount); copy_position(impl, impl->dequeued.incount);
if (b->busy) if (b->busy)
@ -1009,13 +1010,15 @@ static int impl_node_process_input(void *object)
call_process(impl); call_process(impl);
} }
} }
if (io->status != SPA_STATUS_NEED_DATA) { if (io->status != SPA_STATUS_NEED_DATA || io->buffer_id == SPA_ID_INVALID) {
/* pop buffer to recycle */ /* pop buffer to recycle */
if ((b = queue_pop(impl, &impl->queued))) { if ((b = queue_pop(impl, &impl->queued))) {
pw_log_trace_fp("%p: recycle buffer %d", stream, b->id); pw_log_trace_fp("%p: recycle buffer %d", stream, b->id);
} else if (io->status == -EPIPE) io->buffer_id = b->id;
return io->status; } else {
io->buffer_id = b ? b->id : SPA_ID_INVALID; pw_log_trace_fp("%p: no buffers to recycle", stream);
io->buffer_id = SPA_ID_INVALID;
}
io->status = SPA_STATUS_NEED_DATA; io->status = SPA_STATUS_NEED_DATA;
} }
if (impl->driving && impl->using_trigger) if (impl->driving && impl->using_trigger)