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

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.

diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index 33f4d491de0be4985cb4675a105cf564527b7e85..a772e1e06404708730470efafd045b8dcd9cd452 100644 (file)
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -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;
 }

diff --git a/src/pulsecore/device-port.c b/src/pulsecore/device-port.c
index 46e37e25a70e5e4993d374de78a88f204ddb8660..28879f76d764b2871214adc3d9bd768811ddf658 100644 (file)
--- a/src/pulsecore/device-port.c
+++ b/src/pulsecore/device-port.c
@@ -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);

diff --git a/src/pulsecore/device-port.h b/src/pulsecore/device-port.h
index 5880195753fb66927dccaf1619a249cae7ec0239..a5c6420bae02af5ac0266c8a46e7a7f5a70a0347 100644 (file)
--- a/src/pulsecore/device-port.h
+++ b/src/pulsecore/device-port.h
@@ -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

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 545a8e156dd34e0d49f8e5509f68e0a6a55787db..1a1332d3a3e6f3ea8df5e8c2b6af0f2fda1b58cd 100644 (file)
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -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;
 }

diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index b138a1dcd003a180f05d6afbbbb9b8e5c045802d..2c52348b289f7ca7cef18bc4bada3f70d69d8924 100644 (file)
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -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);

diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 63a75ef8c1b99c5244529589ce8446034d5ca94e..9e3a7dcc8ba99183041b8dd9c500404b49c91bfb 100644 (file)
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -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;
 }

diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index da024e654f6f0fc3db5da6291799a2e97cded4ba..dd1e09b172db05789c0add06bdf6cced011262de 100644 (file)
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -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);