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

jack: improve some latency values

Browse source
This commit is contained in:
Wim Taymans 2019-09-02 17:16:57 +02:00
parent fc0b15d17b
commit edaeac6975
1 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/pipewire-jack.c
View file

@ -107,6 +107,8 @@ struct object {
uint32_t type_id; uint32_t type_id;
uint32_t node_id; uint32_t node_id;
uint32_t port_id; uint32_t port_id;
jack_latency_range_t capture_latency;
jack_latency_range_t playback_latency;
} port; } port;
}; };
}; };
@ -259,6 +261,8 @@ struct client {
void *graph_arg; void *graph_arg;
JackXRunCallback xrun_callback; JackXRunCallback xrun_callback;
void *xrun_arg; void *xrun_arg;
JackLatencyCallback latency_callback;
void *latency_arg;
JackSyncCallback sync_callback; JackSyncCallback sync_callback;
void *sync_arg; void *sync_arg;
JackTimebaseCallback timebase_callback; JackTimebaseCallback timebase_callback;
@ -1745,6 +1749,14 @@ static void registry_event_global(void *data, uint32_t id,
o->port.type_id = type_id; o->port.type_id = type_id;
o->port.node_id = node_id; o->port.node_id = node_id;
if (o->port.flags & JackPortIsOutput) {
o->port.capture_latency.min = 1024;
o->port.capture_latency.max = 1024;
} else {
o->port.playback_latency.min = 1024;
o->port.playback_latency.max = 1024;
}
pw_log_debug(NAME" %p: add port %d %s %d", c, id, o->port.name, type_id); pw_log_debug(NAME" %p: add port %d %s %d", c, id, o->port.name, type_id);
break; break;
} }
@ -2431,8 +2443,10 @@ int jack_set_latency_callback (jack_client_t *client,
pw_log_error(NAME" %p: can't set callback on active client", c); pw_log_error(NAME" %p: can't set callback on active client", c);
return -EIO; return -EIO;
} }
pw_log_warn(NAME" %p: not implemented", client); pw_log_debug(NAME" %p: %p %p", c, latency_callback, data);
return -ENOTSUP; c->latency_callback = latency_callback;
c->latency_arg = data;
return 0;
} }
SPA_EXPORT SPA_EXPORT
@ -3130,35 +3144,57 @@ size_t jack_port_type_get_buffer_size (jack_client_t *client, const char *port_t
SPA_EXPORT SPA_EXPORT
void jack_port_set_latency (jack_port_t *port, jack_nframes_t frames) void jack_port_set_latency (jack_port_t *port, jack_nframes_t frames)
{ {
pw_log_warn("not implemented %p %d", port, frames); struct object *o = (struct object *) port;
jack_latency_range_t range = { frames, frames };
if (o->port.flags & JackPortIsOutput) {
jack_port_set_latency_range(port, JackCaptureLatency, &range);
}
if (o->port.flags & JackPortIsInput) {
jack_port_set_latency_range(port, JackPlaybackLatency, &range);
}
} }
SPA_EXPORT SPA_EXPORT
void jack_port_get_latency_range (jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range) void jack_port_get_latency_range (jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range)
{ {
pw_log_warn("not implemented %p %d", port, mode); struct object *o = (struct object *) port;
range->min = 0; if (mode == JackCaptureLatency) {
range->max = 0; *range = o->port.capture_latency;
} else {
*range = o->port.playback_latency;
}
} }
SPA_EXPORT SPA_EXPORT
void jack_port_set_latency_range (jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range) void jack_port_set_latency_range (jack_port_t *port, jack_latency_callback_mode_t mode, jack_latency_range_t *range)
{ {
pw_log_warn("not implemented %p %d", port, mode); struct object *o = (struct object *) port;
if (mode == JackCaptureLatency) {
o->port.capture_latency = *range;
} else {
o->port.playback_latency = *range;
}
} }
SPA_EXPORT SPA_EXPORT
int jack_recompute_total_latencies (jack_client_t *client) int jack_recompute_total_latencies (jack_client_t *client)
{ {
pw_log_warn(NAME" %p: not implemented", client); pw_log_warn(NAME" %p: not implemented", client);
return -ENOTSUP; return 0;
} }
SPA_EXPORT SPA_EXPORT
jack_nframes_t jack_port_get_latency (jack_port_t *port) jack_nframes_t jack_port_get_latency (jack_port_t *port)
{ {
pw_log_warn("not implemented %p", port); struct object *o = (struct object *) port;
return 0; jack_latency_range_t range;
if (o->port.flags & JackPortIsOutput) {
jack_port_get_latency_range(port, JackCaptureLatency, &range);
}
if (o->port.flags & JackPortIsInput) {
jack_port_get_latency_range(port, JackPlaybackLatency, &range);
}
return (range.min + range.max) / 2;
} }
SPA_EXPORT SPA_EXPORT
@ -3173,7 +3209,7 @@ SPA_EXPORT
int jack_recompute_total_latency (jack_client_t *client, jack_port_t* port) int jack_recompute_total_latency (jack_client_t *client, jack_port_t* port)
{ {
pw_log_warn(NAME" %p: not implemented %p", client, port); pw_log_warn(NAME" %p: not implemented %p", client, port);
return -ENOTSUP; return 0;
} }
SPA_EXPORT SPA_EXPORT