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

module-jack-sink/source: Set fixed latency correctly on creation

Browse source 
Changes since v1:
Use max value of jack_port_get_latency_range to calculate the latency
and squash compiler warnings cased by using jack_port_get_total_latency

Modifying latency only works inside a callback, and for hardware the
latency is generally fixed on jack, so just take the max value.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
This commit is contained in:
Maarten Lankhorst 2012-03-26 23:12:24 +02:00 • committed by David Henningsson
parent 6e449eca9a
commit 3116547662
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/jack/module-jack-sink.c
View file

@ -168,10 +168,12 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
case PA_SINK_MESSAGE_GET_LATENCY: { case PA_SINK_MESSAGE_GET_LATENCY: {
jack_nframes_t l, ft, d; jack_nframes_t l, ft, d;
jack_latency_range_t r;
size_t n; size_t n;
/* This is the "worst-case" latency */ /* This is the "worst-case" latency */
l = jack_port_get_total_latency(u->client, u->port[0]) + u->frames_in_buffer; jack_port_get_latency_range(u->port[0], JackPlaybackLatency, &r);
l = r.max + u->frames_in_buffer;
if (u->saved_frame_time_valid) { if (u->saved_frame_time_valid) {
/* Adjust the worst case latency by the time that /* Adjust the worst case latency by the time that
@ -296,6 +298,8 @@ int pa__init(pa_module*m) {
unsigned i; unsigned i;
const char **ports = NULL, **p; const char **ports = NULL, **p;
pa_sink_new_data data; pa_sink_new_data data;
jack_latency_range_t r;
size_t n;
pa_assert(m); pa_assert(m);
@ -443,6 +447,9 @@ int pa__init(pa_module*m) {
} }
} }
jack_port_get_latency_range(u->port[0], JackPlaybackLatency, &r);
n = r.max * pa_frame_size(&u->sink->sample_spec);
pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(n, &u->sink->sample_spec));
pa_sink_put(u->sink); pa_sink_put(u->sink);
if (ports) if (ports)

9
src/modules/jack/module-jack-source.c
View file

@ -124,11 +124,13 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
return 0; return 0;
case PA_SOURCE_MESSAGE_GET_LATENCY: { case PA_SOURCE_MESSAGE_GET_LATENCY: {
jack_latency_range_t r;
jack_nframes_t l, ft, d; jack_nframes_t l, ft, d;
size_t n; size_t n;
/* This is the "worst-case" latency */ /* This is the "worst-case" latency */
l = jack_port_get_total_latency(u->client, u->port[0]); jack_port_get_latency_range(u->port[0], JackCaptureLatency, &r);
l = r.max;
if (u->saved_frame_time_valid) { if (u->saved_frame_time_valid) {
/* Adjust the worst case latency by the time that /* Adjust the worst case latency by the time that
@ -249,6 +251,8 @@ int pa__init(pa_module*m) {
unsigned i; unsigned i;
const char **ports = NULL, **p; const char **ports = NULL, **p;
pa_source_new_data data; pa_source_new_data data;
jack_latency_range_t r;
size_t n;
pa_assert(m); pa_assert(m);
@ -388,6 +392,9 @@ int pa__init(pa_module*m) {
} }
jack_port_get_latency_range(u->port[0], JackCaptureLatency, &r);
n = r.max * pa_frame_size(&u->source->sample_spec);
pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(n, &u->source->sample_spec));
pa_source_put(u->source); pa_source_put(u->source);
if (ports) if (ports)