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

stream: light-weight buffer recycling while in new_buffer

Browse source 
When recycle_buffer() is called while in the new_buffer event handler,
don't send the reuse_buffer event. Instead, mark the buffer for
recycling by putting the buffer ID in the IO area, which is more
light-weight. When need_input reaches the server, it will recycle the
buffer.

Also introduce a helper function for sending the reuse_buffer event.

Change-Id: I900e75694efce2fa7e12840eaf53a7f6b7ae7e8a
This commit is contained in:
David Svensson Fors 2017-10-27 13:48:28 +02:00 • committed by Wim Taymans
parent 82eaf7e8dd
commit 84d422bc46
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/pipewire/stream.c
View file

@ -99,6 +99,7 @@ struct stream {
struct spa_list free; struct spa_list free;
bool in_need_buffer; bool in_need_buffer;
bool in_new_buffer;
int64_t last_ticks; int64_t last_ticks;
int32_t last_rate; int32_t last_rate;
@ -434,6 +435,16 @@ static inline void send_have_output(struct pw_stream *stream)
write(impl->rtwritefd, &cmd, 8); write(impl->rtwritefd, &cmd, 8);
} }
static inline void send_reuse_buffer(struct pw_stream *stream, uint32_t id)
{
struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
uint64_t cmd = 1;
pw_client_node_transport_add_message(impl->trans, (struct pw_client_node_message*)
&PW_CLIENT_NODE_MESSAGE_REUSE_BUFFER_INIT(impl->port_id, id));
write(impl->rtwritefd, &cmd, 8);
}
static void add_request_clock_update(struct pw_stream *stream) static void add_request_clock_update(struct pw_stream *stream)
{ {
struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this); struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
@ -512,7 +523,9 @@ static inline void reuse_buffer(struct pw_stream *stream, uint32_t id)
pw_log_trace("stream %p: reuse buffer %u", stream, id); pw_log_trace("stream %p: reuse buffer %u", stream, id);
bid->used = false; bid->used = false;
spa_list_append(&impl->free, &bid->link); spa_list_append(&impl->free, &bid->link);
impl->in_new_buffer = true;
spa_hook_list_call(&stream->listener_list, struct pw_stream_events, new_buffer, id); spa_hook_list_call(&stream->listener_list, struct pw_stream_events, new_buffer, id);
impl->in_new_buffer = false;
} }
} }
@ -541,8 +554,10 @@ static void handle_rtnode_message(struct pw_stream *stream, struct pw_client_nod
if (input->status == SPA_RESULT_HAVE_BUFFER) { if (input->status == SPA_RESULT_HAVE_BUFFER) {
bid->used = true; bid->used = true;
impl->in_new_buffer = true;
spa_hook_list_call(&stream->listener_list, struct pw_stream_events, spa_hook_list_call(&stream->listener_list, struct pw_stream_events,
new_buffer, buffer_id); new_buffer, buffer_id);
impl->in_new_buffer = false;
} }
input->status = SPA_RESULT_NEED_BUFFER; input->status = SPA_RESULT_NEED_BUFFER;
@ -1085,7 +1100,6 @@ bool pw_stream_recycle_buffer(struct pw_stream *stream, uint32_t id)
{ {
struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this); struct stream *impl = SPA_CONTAINER_OF(stream, struct stream, this);
struct buffer_id *bid; struct buffer_id *bid;
uint64_t cmd = 1;
if ((bid = find_buffer(stream, id)) == NULL || !bid->used) if ((bid = find_buffer(stream, id)) == NULL || !bid->used)
return false; return false;
@ -1093,9 +1107,16 @@ bool pw_stream_recycle_buffer(struct pw_stream *stream, uint32_t id)
bid->used = false; bid->used = false;
spa_list_append(&impl->free, &bid->link); spa_list_append(&impl->free, &bid->link);
pw_client_node_transport_add_message(impl->trans, (struct pw_client_node_message*) if (impl->in_new_buffer) {
&PW_CLIENT_NODE_MESSAGE_REUSE_BUFFER_INIT(impl->port_id, id)); int i;
write(impl->rtwritefd, &cmd, 8);
for (i = 0; i < impl->trans->area->n_input_ports; i++) {
struct spa_port_io *input = &impl->trans->inputs[i];
input->buffer_id = id;
}
} else {
send_reuse_buffer(stream, id);
}
return true; return true;
} }