mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-03-15 05:33:56 -04: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

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;
}