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

stream: remove QUEUED buffer flag

Browse source 
The flag was used to see if a buffer was in a queue or not but that
doesn't really matter much and with the DEQUEUED flag we can only move
buffers from dequeued to queued.
This commit is contained in:
Wim Taymans 2025-09-02 16:37:53 +02:00
parent 4ec9994bf0
commit d48c012715
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/stream.c
View file

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