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

Implement control streams

Browse source 
spa_io_control_range -> spa_io_range
Add helpers for sequence and control pod objects
Implement control properties in audiotestsrc, update test example.
This commit is contained in:
Wim Taymans 2018-08-28 18:16:41 +02:00
parent 90c1a95eef
commit c9526dc2bb
21 changed files with 289 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-client-node/client-stream.c
View file

@ -84,7 +84,7 @@ struct impl {
struct pw_port_mix client_port_mix;
struct spa_io_buffers *io;
struct spa_io_control_range ctrl;
struct spa_io_range range;
struct spa_buffer **buffers;
uint32_t n_buffers;
@ -253,9 +253,9 @@ impl_node_add_port(struct spa_node *node, enum spa_direction direction, uint32_t
if ((res = spa_node_port_set_io(impl->adapter_mix,
direction, port_id,
SPA_IO_ControlRange,
&impl->ctrl,
sizeof(&impl->ctrl))) < 0)
SPA_IO_Range,
&impl->range,
sizeof(&impl->range))) < 0)
return res;
return res;
@ -745,9 +745,9 @@ static int impl_node_process(struct spa_node *node)
struct pw_driver_quantum *q = impl->this.node->driver_node->rt.quantum;
int status, trigger;
impl->ctrl.min_size = impl->ctrl.max_size = q->size * sizeof(float);
impl->range.min_size = impl->range.max_size = q->size * sizeof(float);
spa_log_trace(this->log, "%p: process %d", this, impl->ctrl.max_size);
spa_log_trace(this->log, "%p: process %d", this, impl->range.max_size);
if (impl->use_converter) {
status = spa_node_process(impl->adapter);

71
src/modules/module-media-session/floatmix.c
View file

@ -70,7 +70,7 @@ struct port {
struct port_props props;
struct spa_io_buffers *io;
struct spa_io_control_range *ctrl;
struct spa_io_range *range;
double *io_volume;
int32_t *io_mute;
@ -473,43 +473,19 @@ impl_node_port_enum_params(struct spa_node *node,
case 1:
param = spa_pod_builder_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
":", SPA_PARAM_IO_id, "I", SPA_IO_ControlRange,
":", SPA_PARAM_IO_size, "i", sizeof(struct spa_io_control_range));
":", SPA_PARAM_IO_id, "I", SPA_IO_Range,
":", SPA_PARAM_IO_size, "i", sizeof(struct spa_io_range));
break;
case 2:
param = spa_pod_builder_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
":", SPA_PARAM_IO_id, "I", SPA_IO_Control,
":", SPA_PARAM_IO_size, "i", sizeof(struct spa_io_sequence));
break;
default:
return 0;
}
break;
#if 0
else if (id == t->param_io.idPropsIn) {
struct port_props *p = &port->props;
if (direction == SPA_DIRECTION_OUTPUT)
return 0;
switch (*index) {
case 0:
param = spa_pod_builder_object(&b,
id, t->param_io.Prop,
":", t->param_io.id, "I", t->io_prop_volume,
":", t->param_io.size, "i", sizeof(struct spa_pod_double),
":", t->param.propId, "I", t->prop_volume,
":", t->param.propType, "dru", p->volume,
SPA_POD_PROP_MIN_MAX(0.0, 10.0));
break;
case 1:
param = spa_pod_builder_object(&b,
id, t->param_io.Prop,
":", t->param_io.id, "I", t->io_prop_mute,
":", t->param_io.size, "i", sizeof(struct spa_pod_bool),
":", t->param.propId, "I", t->prop_mute,
":", t->param.propType, "b", p->mute);
break;
default:
return 0;
}
}
#endif
default:
return -ENOENT;
}
@ -712,25 +688,16 @@ impl_node_port_set_io(struct spa_node *node,
port = GET_PORT(this, direction, port_id);
if (id == SPA_IO_Buffers)
switch (id) {
case SPA_IO_Buffers:
port->io = data;
else if (id == SPA_IO_ControlRange)
port->ctrl = data;
#if 0
else if (id == t->io_prop_volume && direction == SPA_DIRECTION_INPUT)
if (data && size >= sizeof(struct spa_pod_double))
port->io_volume = &SPA_POD_VALUE(struct spa_pod_double, data);
else
port->io_volume = &port->props.volume;
else if (id == t->io_prop_mute && direction == SPA_DIRECTION_INPUT)
if (data && size >= sizeof(struct spa_pod_bool))
port->io_mute = &SPA_POD_VALUE(struct spa_pod_bool, data);
else
port->io_mute = &port->props.mute;
#endif
else
break;
case SPA_IO_Range:
port->range = data;
break;
default:
return -ENOENT;
}
return 0;
}
@ -827,8 +794,8 @@ static int impl_node_process(struct spa_node *node)
n_buffers = 0;
maxsize = MAX_SAMPLES * sizeof(float);
if (outport->ctrl)
maxsize = SPA_MIN(outport->ctrl->max_size, maxsize);
if (outport->range)
maxsize = SPA_MIN(outport->range->max_size, maxsize);
for (i = 0; i < this->last_port; i++) {
struct port *inport = GET_IN_PORT(this, i);