diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index 0dc5283df..ed8f9d6cf 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -38,9 +38,8 @@ struct buffer { struct pw_buffer this; uint32_t id; #define BUFFER_FLAG_MAPPED (1 << 0) -#define BUFFER_FLAG_QUEUED (1 << 1) -#define BUFFER_FLAG_DEQUEUED (1 << 2) -#define BUFFER_FLAG_ADDED (1 << 3) +#define BUFFER_FLAG_DEQUEUED (1 << 1) +#define BUFFER_FLAG_ADDED (1 << 2) uint32_t flags; struct spa_meta_busy *busy; }; @@ -341,11 +340,9 @@ static inline int queue_push(struct stream *stream, struct queue *queue, struct { uint32_t index; - if (SPA_FLAG_IS_SET(buffer->flags, BUFFER_FLAG_QUEUED) || - buffer->id >= stream->n_buffers) + if (buffer->id >= stream->n_buffers) return -EINVAL; - SPA_FLAG_SET(buffer->flags, BUFFER_FLAG_QUEUED); queue->incount += buffer->this.size; spa_ringbuffer_get_write_index(&queue->ring, &index); @@ -376,7 +373,6 @@ static inline struct buffer *queue_pop(struct stream *stream, struct queue *queu buffer = &stream->buffers[id]; queue->outcount += buffer->this.size; - SPA_FLAG_CLEAR(buffer->flags, BUFFER_FLAG_QUEUED); return buffer; } @@ -2528,7 +2524,6 @@ static inline int queue_push_front(struct stream *stream, struct queue *queue, s index -= 1; queue->ids[index & MASK_BUFFERS] = buffer->id; queue->outcount -= buffer->this.size; - SPA_FLAG_SET(buffer->flags, BUFFER_FLAG_QUEUED); spa_ringbuffer_read_update(&queue->ring, index); return ret;