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

pipewire/stream: Don't queue back cleared buffers

Browse source 
When renegotiating stream parameters (e.g. size), the buffers
are cleared should no longer be queued back. Add a flag to detect this,
while logging a warning and erroring out when the user tries to queue
such a buffer.
This commit is contained in:
Jonas Ådahl 2025-09-02 13:18:19 +02:00 • committed by Wim Taymans
parent 0095d79ef8
commit 220bdf8a00
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pipewire/stream.c
View file

@ -40,7 +40,8 @@ struct buffer {
uint32_t id;
#define BUFFER_FLAG_MAPPED (1 << 0)
#define BUFFER_FLAG_QUEUED (1 << 1)
#define BUFFER_FLAG_ADDED (1 << 2)
#define BUFFER_FLAG_DEQUEUED (1 << 2)
#define BUFFER_FLAG_ADDED (1 << 3)
uint32_t flags;
struct spa_meta_busy *busy;
};
@ -2513,6 +2514,9 @@ struct pw_buffer *pw_stream_dequeue_buffer(struct pw_stream *stream)
return NULL;
}
}
SPA_FLAG_SET(b->flags, BUFFER_FLAG_DEQUEUED);
return &b->this;
}
@ -2523,6 +2527,13 @@ int pw_stream_queue_buffer(struct pw_stream *stream, struct pw_buffer *buffer)
struct buffer *b = SPA_CONTAINER_OF(buffer, struct buffer, this);
int res;
if (!SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_DEQUEUED)) {
pw_log_warn("%p: tried to queue cleared buffer %d", stream, b->id);
return -EINVAL;
}
SPA_FLAG_CLEAR(b->flags, BUFFER_FLAG_DEQUEUED);
if (b->busy)
SPA_ATOMIC_DEC(b->busy->count);