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

impl-link: start of renegotiation

Browse source 
Handle an EnumFormat param change on the link ports and start
the renegotiation process.
This commit is contained in:
Wim Taymans 2020-06-19 12:14:46 +02:00
parent ebede91239
commit 0dad6c5852
2 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/examples/video-src-alloc.c
View file

@ -218,6 +218,7 @@ static void on_stream_add_buffer(void *_data, struct pw_buffer *buffer)
struct spa_data *d; struct spa_data *d;
unsigned int seals; unsigned int seals;
pw_log_info("add buffer %p", buffer);
d = buf->datas; d = buf->datas;
if ((d[0].type & (1<<SPA_DATA_MemFd)) == 0) { if ((d[0].type & (1<<SPA_DATA_MemFd)) == 0) {
@ -269,6 +270,7 @@ static void on_stream_remove_buffer(void *_data, struct pw_buffer *buffer)
struct spa_data *d; struct spa_data *d;
d = buf->datas; d = buf->datas;
pw_log_info("remove buffer %p", buffer);
munmap(d[0].data, d[0].maxsize); munmap(d[0].data, d[0].maxsize);
close(d[0].fd); close(d[0].fd);

56
src/pipewire/impl-link.c
View file

@ -774,19 +774,60 @@ error_resource:
static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *port, struct pw_impl_port *other, static void port_state_changed(struct pw_impl_link *this, struct pw_impl_port *port, struct pw_impl_port *other,
enum pw_impl_port_state state, const char *error) enum pw_impl_port_state state, const char *error)
{ {
pw_log_debug(NAME" %p: port state %d", this, state); pw_log_debug(NAME" %p: port %p state %d", this, port, state);
switch (state) { switch (state) {
case PW_IMPL_PORT_STATE_ERROR: case PW_IMPL_PORT_STATE_ERROR:
pw_impl_link_update_state(this, PW_LINK_STATE_ERROR, error ? strdup(error) : NULL); pw_impl_link_update_state(this, PW_LINK_STATE_ERROR, error ? strdup(error) : NULL);
break; break;
default: case PW_IMPL_PORT_STATE_INIT:
if (state < PW_IMPL_PORT_STATE_PAUSED && this->prepared) { case PW_IMPL_PORT_STATE_CONFIGURE:
if (this->prepared) {
this->prepared = false;
pw_impl_link_update_state(this, PW_LINK_STATE_INIT, NULL); pw_impl_link_update_state(this, PW_LINK_STATE_INIT, NULL);
} }
break; break;
case PW_IMPL_PORT_STATE_READY:
if (this->prepared) {
this->prepared = false;
pw_impl_link_update_state(this, PW_LINK_STATE_NEGOTIATING, NULL);
}
break;
case PW_IMPL_PORT_STATE_PAUSED:
break;
} }
} }
static void port_param_changed(struct pw_impl_link *this, uint32_t id,
struct pw_impl_port *outport, struct pw_impl_port *inport)
{
enum pw_impl_port_state target;
switch (id) {
case SPA_PARAM_EnumFormat:
target = PW_IMPL_PORT_STATE_CONFIGURE;
break;
// case SPA_PARAM_Buffers:
// target = PW_IMPL_PORT_STATE_READY;
// break;
default:
return;
}
if (outport)
pw_impl_port_update_state(outport, target, NULL);
if (inport)
pw_impl_port_update_state(inport, target, NULL);
pw_impl_link_prepare(this);
}
static void input_port_param_changed(void *data, uint32_t id)
{
struct impl *impl = data;
struct pw_impl_link *this = &impl->this;
port_param_changed(this, id, this->output, this->input);
}
static void input_port_state_changed(void *data, enum pw_impl_port_state old, static void input_port_state_changed(void *data, enum pw_impl_port_state old,
enum pw_impl_port_state state, const char *error) enum pw_impl_port_state state, const char *error)
{ {
@ -795,6 +836,13 @@ static void input_port_state_changed(void *data, enum pw_impl_port_state old,
port_state_changed(this, this->input, this->output, state, error); port_state_changed(this, this->input, this->output, state, error);
} }
static void output_port_param_changed(void *data, uint32_t id)
{
struct impl *impl = data;
struct pw_impl_link *this = &impl->this;
port_param_changed(this, id, this->output, this->input);
}
static void output_port_state_changed(void *data, enum pw_impl_port_state old, static void output_port_state_changed(void *data, enum pw_impl_port_state old,
enum pw_impl_port_state state, const char *error) enum pw_impl_port_state state, const char *error)
{ {
@ -805,12 +853,14 @@ static void output_port_state_changed(void *data, enum pw_impl_port_state old,
static const struct pw_impl_port_events input_port_events = { static const struct pw_impl_port_events input_port_events = {
PW_VERSION_IMPL_PORT_EVENTS, PW_VERSION_IMPL_PORT_EVENTS,
.param_changed = input_port_param_changed,
.state_changed = input_port_state_changed, .state_changed = input_port_state_changed,
.destroy = input_port_destroy, .destroy = input_port_destroy,
}; };
static const struct pw_impl_port_events output_port_events = { static const struct pw_impl_port_events output_port_events = {
PW_VERSION_IMPL_PORT_EVENTS, PW_VERSION_IMPL_PORT_EVENTS,
.param_changed = output_port_param_changed,
.state_changed = output_port_state_changed, .state_changed = output_port_state_changed,
.destroy = output_port_destroy, .destroy = output_port_destroy,
}; };