mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add control properties to audiotestsrc

Browse source 
Add control properties to audiotestsrc for frequency and volume
and add a test program.
Add size parameter to set_io for additional checks and to make it
easy to know how much control data we can write.
This commit is contained in:
Wim Taymans 2017-11-22 14:30:04 +01:00
parent 8efea3e1ea
commit a092b9312a
28 changed files with 774 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/alsa/alsa-sink.c
View file

@ -521,7 +521,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct state *this;
struct type *t;
@ -534,9 +534,9 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else if (id == t->io.ControlRange)
this->range = io;
this->range = data;
else
return -ENOENT;

4
spa/plugins/alsa/alsa-source.c
View file

@ -556,7 +556,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct state *this;
struct type *t;
@ -569,7 +569,7 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else
return -ENOENT;

6
spa/plugins/audiomixer/audiomixer.c
View file

@ -630,7 +630,7 @@ impl_node_port_alloc_buffers(struct spa_node *node,
static int
impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t id, void *io)
uint32_t id, void *data, size_t size)
{
struct impl *this;
struct port *port;
@ -646,9 +646,9 @@ impl_node_port_set_io(struct spa_node *node,
port = GET_PORT(this, direction, port_id);
if (id == t->io.Buffers)
port->io = io;
port->io = data;
else if (id == t->io.ControlRange)
port->range = io;
port->range = data;
else
return -ENOENT;

82
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -34,6 +34,7 @@
#include <spa/param/audio/format-utils.h>
#include <spa/param/buffers.h>
#include <spa/param/meta.h>
#include <spa/param/io.h>
#include <lib/pod.h>
@ -52,6 +53,9 @@ struct type {
uint32_t prop_wave;
uint32_t prop_freq;
uint32_t prop_volume;
uint32_t io_prop_wave;
uint32_t io_prop_freq;
uint32_t io_prop_volume;
uint32_t wave_sine;
uint32_t wave_square;
struct spa_type_io io;
@ -66,6 +70,7 @@ struct type {
struct spa_type_command_node command_node;
struct spa_type_param_buffers param_buffers;
struct spa_type_param_meta param_meta;
struct spa_type_param_io param_io;
};
static inline void init_type(struct type *type, struct spa_type_map *map)
@ -78,6 +83,9 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
type->prop_wave = spa_type_map_get_id(map, SPA_TYPE_PROPS__waveType);
type->prop_freq = spa_type_map_get_id(map, SPA_TYPE_PROPS__frequency);
type->prop_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->io_prop_wave = spa_type_map_get_id(map, SPA_TYPE_IO_INPUT_PROP_BASE "waveType");
type->io_prop_freq = spa_type_map_get_id(map, SPA_TYPE_IO_INPUT_PROP_BASE "frequency");
type->io_prop_volume = spa_type_map_get_id(map, SPA_TYPE_IO_INPUT_PROP_BASE "volume");
type->wave_sine = spa_type_map_get_id(map, SPA_TYPE_PROPS__waveType ":sine");
type->wave_square = spa_type_map_get_id(map, SPA_TYPE_PROPS__waveType ":square");
spa_type_io_map(map, &type->io);
@ -92,6 +100,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
spa_type_command_node_map(map, &type->command_node);
spa_type_param_buffers_map(map, &type->param_buffers);
spa_type_param_meta_map(map, &type->param_meta);
spa_type_param_io_map(map, &type->param_io);
}
struct props {
@ -136,7 +145,11 @@ struct impl {
struct spa_port_info info;
struct spa_io_buffers *io;
struct spa_io_control_range *range;
struct spa_io_control_range *io_range;
uint32_t *io_wave;
double *io_freq;
double *io_volume;
bool have_format;
struct spa_audio_info current_format;
@ -300,7 +313,7 @@ static int make_buffer(struct impl *this)
{
struct buffer *b;
struct spa_io_buffers *io = this->io;
struct spa_io_control_range *range = this->range;
struct spa_io_control_range *range = this->io_range;
int n_bytes, n_samples;
uint32_t maxsize;
void *data;
@ -599,7 +612,8 @@ impl_node_port_enum_params(struct spa_node *node,
uint32_t list[] = { t->param.idEnumFormat,
t->param.idFormat,
t->param.idBuffers,
t->param.idMeta };
t->param.idMeta,
t->param.idIO };
if (*index < SPA_N_ELEMENTS(list))
param = spa_pod_builder_object(&b, id, t->param.List,
@ -646,6 +660,52 @@ impl_node_port_enum_params(struct spa_node *node,
return 0;
}
}
else if (id == t->param.idIO) {
struct props *p = &this->props;
switch (*index) {
case 0:
param = spa_pod_builder_object(&b,
id, t->param_io.IO,
":", t->param_io.id, "I", t->io.Buffers,
":", t->param_io.size, "i", sizeof(struct spa_io_buffers));
break;
case 1:
param = spa_pod_builder_object(&b,
id, t->param_io.IO,
":", t->param_io.id, "I", t->io.ControlRange,
":", t->param_io.size, "i", sizeof(struct spa_io_control_range));
break;
case 2:
param = spa_pod_builder_object(&b,
id, t->param_io.IO,
":", t->param_io.id, "I", t->io_prop_wave,
":", t->param_io.size, "i", sizeof(uint32_t),
":", t->param_io.propId, "I", t->prop_wave,
":", t->param_io.propType, "Ie", p->wave,
2, t->wave_sine,
t->wave_square);
break;
case 3:
param = spa_pod_builder_object(&b,
id, t->param_io.IO,
":", t->param_io.id, "I", t->io_prop_freq,
":", t->param_io.size, "i", sizeof(double),
":", t->param_io.propId, "I", t->prop_freq,
":", t->param_io.propType, "dr", p->freq, 2, 0.0, 50000000.0);
break;
case 4:
param = spa_pod_builder_object(&b,
id, t->param_io.IO,
":", t->param_io.id, "I", t->io_prop_volume,
":", t->param_io.size, "i", sizeof(double),
":", t->param_io.propId, "I", t->prop_volume,
":", t->param_io.propType, "dr", p->volume, 2, 0.0, 10.0);
break;
default:
return 0;
}
}
else
return -ENOENT;
@ -814,7 +874,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct type *t;
@ -827,9 +887,15 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else if (id == t->io.ControlRange)
this->range = io;
this->io_range = data;
else if (id == t->io_prop_wave)
this->io_wave = data;
else if (id == t->io_prop_freq)
this->io_freq = data;
else if (id == t->io_prop_volume)
this->io_volume = data;
else
return -ENOENT;
@ -1053,6 +1119,10 @@ impl_init(const struct spa_handle_factory *factory,
this->clock = impl_clock;
reset_props(this, &this->props);
this->io_wave = &this->props.wave;
this->io_freq = &this->props.freq;
this->io_volume = &this->props.volume;
spa_list_init(&this->empty);
this->timer_source.func = on_output;

6
spa/plugins/audiotestsrc/render.c
View file

@ -27,10 +27,12 @@ audio_test_src_create_sine_##type (struct impl *this, type *samples, size_t n_sa
{ \
int i, c, channels; \
double step, amp; \
double freq = *this->io_freq; \
double volume = *this->io_volume; \
\
channels = this->current_format.info.raw.channels; \
step = M_PI_M2 * this->props.freq / this->current_format.info.raw.rate; \
amp = this->props.volume * scale; \
step = M_PI_M2 * freq / this->current_format.info.raw.rate; \
amp = volume * scale; \
\
for (i = 0; i < n_samples; i++) { \
type val; \

4
spa/plugins/ffmpeg/ffmpeg-dec.c
View file

@ -412,7 +412,7 @@ spa_ffmpeg_dec_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct port *port;
@ -430,7 +430,7 @@ spa_ffmpeg_dec_node_port_set_io(struct spa_node *node,
port = GET_PORT(this, direction, port_id);
if (id == t->io.Buffers)
port->io = io;
port->io = data;
else
return -ENOENT;

4
spa/plugins/ffmpeg/ffmpeg-enc.c
View file

@ -397,7 +397,7 @@ spa_ffmpeg_enc_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct port *port;
@ -415,7 +415,7 @@ spa_ffmpeg_enc_node_port_set_io(struct spa_node *node,
port = GET_PORT(this, direction, port_id);
if (id == t->io.Buffers)
port->io = io;
port->io = data;
else
return -ENOENT;

4
spa/plugins/test/fakesink.c
View file

@ -669,7 +669,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct type *t;
@ -682,7 +682,7 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else
return -ENOENT;

4
spa/plugins/test/fakesrc.c
View file

@ -686,7 +686,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct type *t;
@ -699,7 +699,7 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else
return -ENOENT;

4
spa/plugins/v4l2/v4l2-source.c
View file

@ -763,7 +763,7 @@ static int impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct type *t;
@ -776,7 +776,7 @@ static int impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->out_ports[port_id].io = io;
this->out_ports[port_id].io = data;
else
return -ENOENT;

4
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -757,7 +757,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct type *t;
@ -770,7 +770,7 @@ impl_node_port_set_io(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
if (id == t->io.Buffers)
this->io = io;
this->io = data;
else
return -ENOENT;

6
spa/plugins/volume/volume.c
View file

@ -634,7 +634,7 @@ impl_node_port_set_io(struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t id,
void *io)
void *data, size_t size)
{
struct impl *this;
struct port *port;
@ -650,9 +650,9 @@ impl_node_port_set_io(struct spa_node *node,
port = GET_PORT(this, direction, port_id);
if (id == t->io.Buffers)
port->io = io;
port->io = data;
else if (id == t->io.ControlRange)
port->range = io;
port->range = data;
else
return -ENOENT;