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

jack: more improvements

Browse source 
Fill in the position and clock fields with jack values.
Advertize PARAMS correctly.
This commit is contained in:
Wim Taymans 2019-08-21 15:18:33 +02:00
parent 6f5e6568c9
commit f746c29768
5 changed files with 155 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/include/spa/node/node.h
View file

@ -640,6 +640,7 @@ struct spa_node_methods {
/** node keys */ /** node keys */
#define SPA_KEY_NODE_NAME "node.name" /**< a node name */ #define SPA_KEY_NODE_NAME "node.name" /**< a node name */
#define SPA_KEY_NODE_DRIVER "node.driver" /**< the node can be a driver */ #define SPA_KEY_NODE_DRIVER "node.driver" /**< the node can be a driver */
#define SPA_KEY_NODE_LATENCY "node.latency" /**< the requested node latency */
#define SPA_KEY_NODE_PAUSE_ON_IDLE "node.pause-on-idle" /**< if the node should be paused #define SPA_KEY_NODE_PAUSE_ON_IDLE "node.pause-on-idle" /**< if the node should be paused
* immediately when idle. */ * immediately when idle. */

16
spa/plugins/jack/jack-client.c
View file

@ -30,7 +30,14 @@ static int jack_process(jack_nframes_t nframes, void *arg)
{ {
struct spa_jack_client *client = arg; struct spa_jack_client *client = arg;
jack_get_cycle_times(client->client,
&client->current_frames, &client->current_usecs,
&client->next_usecs, &client->period_usecs);
jack_transport_query (client->client, &client->pos);
client->buffer_size = nframes; client->buffer_size = nframes;
spa_jack_client_emit_process(client); spa_jack_client_emit_process(client);
return 0; return 0;
@ -43,12 +50,6 @@ static void jack_shutdown(void* arg)
spa_jack_client_emit_shutdown(client); spa_jack_client_emit_shutdown(client);
} }
static int jack_buffer_size(jack_nframes_t nframes, void *arg)
{
return 0;
}
static int status_to_result(jack_status_t status) static int status_to_result(jack_status_t status)
{ {
int res; int res;
@ -83,7 +84,8 @@ int spa_jack_client_open(struct spa_jack_client *client,
jack_set_process_callback(client->client, jack_process, client); jack_set_process_callback(client->client, jack_process, client);
jack_on_shutdown(client->client, jack_shutdown, client); jack_on_shutdown(client->client, jack_shutdown, client);
jack_set_buffer_size_callback(client->client, jack_buffer_size, client); client->frame_rate = jack_get_sample_rate(client->client);
client->buffer_size = jack_get_buffer_size(client->client);
return 0; return 0;
} }

7
spa/plugins/jack/jack-client.h
View file

@ -50,7 +50,14 @@ struct spa_jack_client {
struct spa_log *log; struct spa_log *log;
jack_client_t *client; jack_client_t *client;
jack_nframes_t frame_rate;
jack_nframes_t buffer_size; jack_nframes_t buffer_size;
jack_nframes_t current_frames;
jack_time_t current_usecs;
jack_time_t next_usecs;
float period_usecs;
jack_position_t pos;
struct spa_hook_list listener_list; struct spa_hook_list listener_list;
}; };

117
spa/plugins/jack/jack-sink.c
View file

@ -73,7 +73,6 @@ struct port {
int stride; int stride;
struct spa_io_buffers *io; struct spa_io_buffers *io;
struct spa_io_clock *io_clock;
struct buffer buffers[MAX_BUFFERS]; struct buffer buffers[MAX_BUFFERS];
uint32_t n_buffers; uint32_t n_buffers;
@ -90,11 +89,14 @@ struct impl {
uint64_t info_all; uint64_t info_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_param_info params[4]; struct spa_param_info params[5];
struct spa_hook_list hooks; struct spa_hook_list hooks;
struct spa_callbacks callbacks; struct spa_callbacks callbacks;
struct spa_io_clock *clock;
struct spa_io_position *position;
struct port in_ports[MAX_PORTS]; struct port in_ports[MAX_PORTS];
uint32_t n_in_ports; uint32_t n_in_ports;
@ -151,6 +153,25 @@ static int impl_node_enum_params(void *object, int seq,
} }
break; break;
case SPA_PARAM_IO:
switch (result.index) {
case 0:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Clock),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_clock)));
break;
case 1:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Position),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_position)));
break;
default:
return 0;
}
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -168,7 +189,21 @@ static int impl_node_enum_params(void *object, int seq,
static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size) static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
{ {
return -ENOTSUP; struct impl *this = object;
spa_return_val_if_fail(this != NULL, -EINVAL);
switch (id) {
case SPA_IO_Clock:
this->clock = data;
break;
case SPA_IO_Position:
this->position = data;
break;
default:
return -ENOENT;
}
return 0;
} }
static int impl_node_set_param(void *object, uint32_t id, uint32_t flags, static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
@ -212,18 +247,21 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
return 0; return 0;
} }
static const struct spa_dict_item node_info_items[] = {
{ SPA_KEY_MEDIA_CLASS, "Audio/Sink" },
{ SPA_KEY_NODE_NAME, "jack_system" },
{ SPA_KEY_NODE_DRIVER, "true" },
};
static void emit_node_info(struct impl *this, bool full) static void emit_node_info(struct impl *this, bool full)
{ {
if (full) if (full)
this->info.change_mask = this->info_all; this->info.change_mask = this->info_all;
if (this->info.change_mask) { if (this->info.change_mask) {
this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items); struct spa_dict_item items[5];
char latency[64];
snprintf(latency, sizeof(latency), "%d/%d",
this->client->buffer_size, this->client->frame_rate);
items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Sink");
items[1] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_NAME, "jack_system");
items[2] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
items[3] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_PAUSE_ON_IDLE, "false");
items[4] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_LATENCY, latency);
this->info.props = &SPA_DICT_INIT_ARRAY(items);
spa_node_emit_info(&this->hooks, &this->info); spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = 0; this->info.change_mask = 0;
} }
@ -280,6 +318,38 @@ impl_node_set_callbacks(void *object,
static void client_process(void *data) static void client_process(void *data)
{ {
struct impl *this = data; struct impl *this = data;
if (this->clock) {
struct spa_io_clock *c = this->clock;
c->nsec = this->client->current_usecs * SPA_NSEC_PER_USEC;
c->rate = SPA_FRACTION(1, this->client->frame_rate);
c->position = this->client->current_frames;
c->delay = 0;
c->rate_diff = 1.0;
}
if (this->position) {
jack_position_t *jp = &this->client->pos;
struct spa_io_position *p = this->position;
p->version = 0;
p->size = this->client->buffer_size;
p->rate = SPA_FRACTION(1, this->client->frame_rate);
p->flags = 0;
if (jp->valid & JackPositionBBT) {
p->flags |= SPA_IO_POSITION_FLAG_BAR;
p->bar.size = sizeof(struct spa_io_position_bar);
if (jp->valid & JackBBTFrameOffset)
p->bar.offset = jp->bbt_offset;
else
p->bar.offset = 0;
p->bar.signature = SPA_FRACTION(jp->beats_per_bar, jp->beat_type);
p->bar.bpm = jp->beats_per_minute;
p->bar.bar = jp->bar;
p->bar.last_bar = jp->bar;
p->bar.cycle_start = jp->bar;
p->bar.cycle_end = jp->bar;
}
}
spa_node_call_ready(&this->callbacks, SPA_STATUS_NEED_BUFFER); spa_node_call_ready(&this->callbacks, SPA_STATUS_NEED_BUFFER);
} }
@ -475,12 +545,6 @@ impl_node_port_enum_params(void *object, int seq,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Buffers), SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Buffers),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers))); SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
break; break;
case 1:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Clock),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_clock)));
break;
default: default:
return 0; return 0;
} }
@ -633,9 +697,6 @@ impl_node_port_set_io(void *object,
case SPA_IO_Buffers: case SPA_IO_Buffers:
port->io = data; port->io = data;
break; break;
case SPA_IO_Clock:
port->io_clock = data;
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -663,23 +724,20 @@ static int impl_node_process(void *object)
uint32_t n_frames = this->client->buffer_size; uint32_t n_frames = this->client->buffer_size;
void *dst; void *dst;
if (io == NULL || io->status != SPA_STATUS_HAVE_BUFFER) dst = jack_port_get_buffer(port->jack_port, n_frames);
continue;
if (io->buffer_id >= port->n_buffers) if (io == NULL ||
io->status != SPA_STATUS_HAVE_BUFFER ||
io->buffer_id >= port->n_buffers) {
memset(dst, 0, n_frames * sizeof(float));
continue; continue;
}
spa_log_trace(this->log, NAME" %p: port %d: buffer %d", this, i, io->buffer_id); spa_log_trace(this->log, NAME" %p: port %d: buffer %d", this, i, io->buffer_id);
b = &port->buffers[io->buffer_id]; b = &port->buffers[io->buffer_id];
src = &b->outbuf->datas[0]; src = &b->outbuf->datas[0];
dst = jack_port_get_buffer(port->jack_port, n_frames);
memcpy(dst, src->data, n_frames * port->stride); memcpy(dst, src->data, n_frames * port->stride);
src->chunk->offset = 0;
src->chunk->size = n_frames * port->stride;
src->chunk->stride = port->stride;
src->chunk->flags = 0;
io->status = SPA_STATUS_NEED_BUFFER; io->status = SPA_STATUS_NEED_BUFFER;
@ -785,8 +843,9 @@ impl_init(const struct spa_handle_factory *factory,
this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READ); this->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READ);
this->params[3] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); this->params[3] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
this->params[4] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 4; this->info.n_params = 5;
init_ports(this); init_ports(this);

70
spa/plugins/jack/jack-source.c
View file

@ -73,7 +73,6 @@ struct port {
int stride; int stride;
struct spa_io_buffers *io; struct spa_io_buffers *io;
struct spa_io_clock *io_clock;
struct buffer buffers[MAX_BUFFERS]; struct buffer buffers[MAX_BUFFERS];
uint32_t n_buffers; uint32_t n_buffers;
@ -92,11 +91,14 @@ struct impl {
uint64_t info_all; uint64_t info_all;
struct spa_node_info info; struct spa_node_info info;
struct spa_param_info params[4]; struct spa_param_info params[5];
struct spa_hook_list hooks; struct spa_hook_list hooks;
struct spa_callbacks callbacks; struct spa_callbacks callbacks;
struct spa_io_clock *clock;
struct spa_io_position *position;
struct port out_ports[MAX_PORTS]; struct port out_ports[MAX_PORTS];
uint32_t n_out_ports; uint32_t n_out_ports;
@ -153,6 +155,25 @@ static int impl_node_enum_params(void *object, int seq,
} }
break; break;
case SPA_PARAM_IO:
switch (result.index) {
case 0:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Clock),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_clock)));
break;
case 1:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Position),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_position)));
break;
default:
return 0;
}
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -170,7 +191,21 @@ static int impl_node_enum_params(void *object, int seq,
static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size) static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
{ {
return -ENOTSUP; struct impl *this = object;
spa_return_val_if_fail(this != NULL, -EINVAL);
switch (id) {
case SPA_IO_Clock:
this->clock = data;
break;
case SPA_IO_Position:
this->position = data;
break;
default:
return -ENOENT;
}
return 0;
} }
static int impl_node_set_param(void *object, uint32_t id, uint32_t flags, static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
@ -240,18 +275,21 @@ static int impl_node_send_command(void *object, const struct spa_command *comman
return 0; return 0;
} }
static const struct spa_dict_item node_info_items[] = {
{ SPA_KEY_MEDIA_CLASS, "Audio/Source" },
{ SPA_KEY_NODE_NAME, "jack_system" },
{ SPA_KEY_NODE_DRIVER, "true" },
};
static void emit_node_info(struct impl *this, bool full) static void emit_node_info(struct impl *this, bool full)
{ {
if (full) if (full)
this->info.change_mask = this->info_all; this->info.change_mask = this->info_all;
if (this->info.change_mask) { if (this->info.change_mask) {
this->info.props = &SPA_DICT_INIT_ARRAY(node_info_items); struct spa_dict_item items[5];
char latency[64];
snprintf(latency, sizeof(latency), "%d/%d",
this->client->buffer_size, this->client->frame_rate);
items[0] = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Source");
items[1] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_NAME, "jack_system");
items[2] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");
items[3] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_PAUSE_ON_IDLE, "false");
items[4] = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_LATENCY, latency);
this->info.props = &SPA_DICT_INIT_ARRAY(items);
spa_node_emit_info(&this->hooks, &this->info); spa_node_emit_info(&this->hooks, &this->info);
this->info.change_mask = 0; this->info.change_mask = 0;
} }
@ -510,12 +548,6 @@ impl_node_port_enum_params(void *object, int seq,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Buffers), SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Buffers),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers))); SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_buffers)));
break; break;
case 1:
param = spa_pod_builder_add_object(&b,
SPA_TYPE_OBJECT_ParamIO, id,
SPA_PARAM_IO_id, SPA_POD_Id(SPA_IO_Clock),
SPA_PARAM_IO_size, SPA_POD_Int(sizeof(struct spa_io_clock)));
break;
default: default:
return 0; return 0;
} }
@ -670,9 +702,6 @@ impl_node_port_set_io(void *object,
case SPA_IO_Buffers: case SPA_IO_Buffers:
port->io = data; port->io = data;
break; break;
case SPA_IO_Clock:
port->io_clock = data;
break;
default: default:
return -ENOENT; return -ENOENT;
} }
@ -840,8 +869,9 @@ impl_init(const struct spa_handle_factory *factory,
this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE); this->params[1] = SPA_PARAM_INFO(SPA_PARAM_Props, SPA_PARAM_INFO_READWRITE);
this->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READ); this->params[2] = SPA_PARAM_INFO(SPA_PARAM_Format, SPA_PARAM_INFO_READ);
this->params[3] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ); this->params[3] = SPA_PARAM_INFO(SPA_PARAM_EnumFormat, SPA_PARAM_INFO_READ);
this->params[4] = SPA_PARAM_INFO(SPA_PARAM_IO, SPA_PARAM_INFO_READ);
this->info.params = this->params; this->info.params = this->params;
this->info.n_params = 4; this->info.n_params = 5;
init_ports(this); init_ports(this);