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

stream: only remove buffer when added

Browse source
This commit is contained in:
Wim Taymans 2020-06-15 17:39:00 +02:00
parent 8ecae0785b
commit 4743a423e8
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/pipewire/filter.c
View file

@ -57,6 +57,7 @@ struct buffer {
uint32_t id;
#define BUFFER_FLAG_MAPPED (1 << 0)
#define BUFFER_FLAG_QUEUED (1 << 1)
#define BUFFER_FLAG_ADDED (1 << 2)
uint32_t flags;
};
@ -585,7 +586,8 @@ static void clear_buffers(struct port *port)
for (i = 0; i < port->n_buffers; i++) {
struct buffer *b = &port->buffers[i];
pw_filter_emit_remove_buffer(&impl->this, port->user_data, &b->this);
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_ADDED))
pw_filter_emit_remove_buffer(&impl->this, port->user_data, &b->this);
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_MAPPED)) {
for (j = 0; j < b->this.buffer->n_datas; j++) {
@ -704,6 +706,7 @@ static int impl_port_use_buffers(void *object,
push_queue(port, &port->dequeued, b);
}
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ADDED);
pw_filter_emit_add_buffer(filter, port->user_data, &b->this);
}

5
src/pipewire/stream.c
View file

@ -54,6 +54,7 @@ struct buffer {
uint32_t id;
#define BUFFER_FLAG_MAPPED (1 << 0)
#define BUFFER_FLAG_QUEUED (1 << 1)
#define BUFFER_FLAG_ADDED (1 << 2)
uint32_t flags;
};
@ -585,7 +586,8 @@ static void clear_buffers(struct pw_stream *stream)
for (i = 0; i < impl->n_buffers; i++) {
struct buffer *b = &impl->buffers[i];
pw_stream_emit_remove_buffer(stream, &b->this);
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_ADDED))
pw_stream_emit_remove_buffer(stream, &b->this);
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_MAPPED)) {
for (j = 0; j < b->this.buffer->n_datas; j++) {
@ -696,6 +698,7 @@ static int impl_port_use_buffers(void *object,
push_queue(impl, &impl->dequeued, b);
}
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ADDED);
pw_stream_emit_add_buffer(stream, &b->this);
}