mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device-port: Change the latency offset type to a signed int.

Browse source 
The latency offset type should be signed (int64_t) so we can also add
a negative latency offset.

This also includes changing the type of the sink/source
offsets and updating pacmd so it handles negative numbers.
This commit is contained in:
poljar (Damir Jelić) 2012-06-27 17:38:42 +02:00 • committed by Tanu Kaskinen
parent f6e4bfbbc5
commit bf4091dcf8
7 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulsecore/cli-command.c
View file

@ -1766,7 +1766,7 @@ static int pa_cli_command_port_offset(pa_core *c, pa_tokenizer *t, pa_strbuf *bu
return -1;
}
pa_device_port_set_latency_offset(port, (pa_usec_t) offset);
pa_device_port_set_latency_offset(port, offset);
return 0;
}

2
src/pulsecore/device-port.c
View file

@ -114,7 +114,7 @@ void pa_device_port_hashmap_free(pa_hashmap *h) {
pa_hashmap_free(h, NULL, NULL);
}
void pa_device_port_set_latency_offset(pa_device_port *p, pa_usec_t offset) {
void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset) {
uint32_t state;
pa_assert(p);

4
src/pulsecore/device-port.h
View file

@ -51,7 +51,7 @@ struct pa_device_port {
pa_hashmap *profiles; /* Does not own the profiles */
pa_bool_t is_input:1;
pa_bool_t is_output:1;
pa_usec_t latency_offset;
int64_t latency_offset;
/* .. followed by some implementation specific data */
};
@ -68,6 +68,6 @@ void pa_device_port_hashmap_free(pa_hashmap *h);
/* The port's available status has changed */
void pa_device_port_set_available(pa_device_port *p, pa_port_available_t available);
void pa_device_port_set_latency_offset(pa_device_port *p, pa_usec_t offset);
void pa_device_port_set_latency_offset(pa_device_port *p, int64_t offset);
#endif

20
src/pulsecore/sink.c
View file

@ -1428,7 +1428,12 @@ pa_usec_t pa_sink_get_latency(pa_sink *s) {
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) == 0);
usec += s->latency_offset;
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
if (-s->latency_offset <= (int64_t) usec)
usec += s->latency_offset;
else
usec = 0;
return usec;
}
@ -1457,7 +1462,12 @@ pa_usec_t pa_sink_get_latency_within_thread(pa_sink *s) {
if (o->process_msg(o, PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0)
return -1;
usec += s->thread_info.latency_offset;
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
if (-s->thread_info.latency_offset <= (int64_t) usec)
usec += s->thread_info.latency_offset;
else
usec = 0;
return usec;
}
@ -2823,7 +2833,7 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
return 0;
case PA_SINK_MESSAGE_SET_LATENCY_OFFSET:
s->thread_info.latency_offset = (pa_usec_t) offset;
s->thread_info.latency_offset = offset;
return 0;
case PA_SINK_MESSAGE_GET_LATENCY:
@ -3238,13 +3248,13 @@ void pa_sink_set_fixed_latency_within_thread(pa_sink *s, pa_usec_t latency) {
}
/* Called from main context */
void pa_sink_set_latency_offset(pa_sink *s, pa_usec_t offset) {
void pa_sink_set_latency_offset(pa_sink *s, int64_t offset) {
pa_sink_assert_ref(s);
s->latency_offset = offset;
if (PA_SINK_IS_LINKED(s->state))
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_LATENCY_OFFSET, NULL, (int64_t) offset, NULL) == 0);
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_LATENCY_OFFSET, NULL, offset, NULL) == 0);
else
s->thread_info.fixed_latency = offset;
}

6
src/pulsecore/sink.h
View file

@ -114,7 +114,7 @@ struct pa_sink {
pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
pa_usec_t latency_offset;
int64_t latency_offset;
unsigned priority;
@ -272,7 +272,7 @@ struct pa_sink {
pa_usec_t fixed_latency; /* for sinks with PA_SINK_DYNAMIC_LATENCY this is 0 */
/* This latency offset is a direct copy from s->latency_offset */
pa_usec_t latency_offset;
int64_t latency_offset;
/* Delayed volume change events are queued here. The events
* are stored in expiration order. The one expiring next is in
@ -410,7 +410,7 @@ unsigned pa_device_init_priority(pa_proplist *p);
/**** May be called by everyone, from main context */
pa_bool_t pa_sink_update_rate(pa_sink *s, uint32_t rate, pa_bool_t passthrough);
void pa_sink_set_latency_offset(pa_sink *s, pa_usec_t offset);
void pa_sink_set_latency_offset(pa_sink *s, int64_t offset);
/* The returned value is supposed to be in the time domain of the sound card! */
pa_usec_t pa_sink_get_latency(pa_sink *s);

20
src/pulsecore/source.c
View file

@ -1030,7 +1030,12 @@ pa_usec_t pa_source_get_latency(pa_source *s) {
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_LATENCY, &usec, 0, NULL) == 0);
usec += s->latency_offset;
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
if (-s->latency_offset <= (int64_t) usec)
usec += s->latency_offset;
else
usec = 0;
return usec;
}
@ -1059,7 +1064,12 @@ pa_usec_t pa_source_get_latency_within_thread(pa_source *s) {
if (o->process_msg(o, PA_SOURCE_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0)
return -1;
usec += s->thread_info.latency_offset;
/* usec is unsigned, so check that the offset can be added to usec without
* underflowing. */
if (-s->thread_info.latency_offset <= (int64_t) usec)
usec += s->thread_info.latency_offset;
else
usec = 0;
return usec;
}
@ -2179,7 +2189,7 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
return 0;
case PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET:
s->thread_info.latency_offset = (pa_usec_t) offset;
s->thread_info.latency_offset = offset;
return 0;
case PA_SOURCE_MESSAGE_MAX:
@ -2522,13 +2532,13 @@ void pa_source_set_fixed_latency_within_thread(pa_source *s, pa_usec_t latency)
}
/* Called from main thread */
void pa_source_set_latency_offset(pa_source *s, pa_usec_t offset) {
void pa_source_set_latency_offset(pa_source *s, int64_t offset) {
pa_source_assert_ref(s);
s->latency_offset = offset;
if (PA_SOURCE_IS_LINKED(s->state))
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET, NULL, (int64_t) offset, NULL) == 0);
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_LATENCY_OFFSET, NULL, offset, NULL) == 0);
else
s->thread_info.fixed_latency = offset;
}

6
src/pulsecore/source.h
View file

@ -114,7 +114,7 @@ struct pa_source {
pa_atomic_t mixer_dirty;
/* The latency offset is inherited from the currently active port */
pa_usec_t latency_offset;
int64_t latency_offset;
unsigned priority;
@ -213,7 +213,7 @@ struct pa_source {
pa_usec_t fixed_latency; /* for sources with PA_SOURCE_DYNAMIC_LATENCY this is 0 */
/* This latency offset is a direct copy from s->latency_offset */
pa_usec_t latency_offset;
int64_t latency_offset;
/* Delayed volume change events are queued here. The events
* are stored in expiration order. The one expiring next is in
@ -342,7 +342,7 @@ void pa_source_update_flags(pa_source *s, pa_source_flags_t mask, pa_source_flag
/*** May be called by everyone, from main context */
void pa_source_set_latency_offset(pa_source *s, pa_usec_t offset);
void pa_source_set_latency_offset(pa_source *s, int64_t offset);
/* The returned value is supposed to be in the time domain of the sound card! */
pa_usec_t pa_source_get_latency(pa_source *s);