1 files changed, 23 insertions, 9 deletions

diff --git a/src/sound.cpp b/src/sound.cpp
index c3aa4d4..53000bd 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -41,6 +41,7 @@ struct pa_handle {
     size_t output_index, output_length;
 
     int operation_success;
+    double latency_seconds;
 };
 
 static void pa_sound_device_free(pa_handle *s) {
@@ -79,8 +80,9 @@ static pa_handle* pa_sound_device_new(const char *server,
     p->read_data = NULL;
     p->read_length = 0;
     p->read_index = 0;
+    p->latency_seconds = 0.0;
 
-    const int buffer_size = attr->maxlength;
+    const int buffer_size = attr->fragsize;
     void *buffer = malloc(buffer_size);
     if(!buffer) {
         fprintf(stderr, "failed to allocate buffer for audio\n");
@@ -153,20 +155,21 @@ fail:
     return NULL;
 }
 
-// Returns a negative value on failure or if |p->output_length| data is not available within the time frame specified by the sample rate
-static int pa_sound_device_read(pa_handle *p) {
+static int pa_sound_device_read(pa_handle *p, double timeout_seconds) {
     assert(p);
 
-    const int64_t timeout_ms = std::round((1000.0 / (double)pa_stream_get_sample_spec(p->stream)->rate) * 1000.0);
     const double start_time = clock_get_monotonic_seconds();
 
     bool success = false;
     int r = 0;
     int *rerror = &r;
+    pa_usec_t latency = 0;
+    int negative = 0;
+
     CHECK_DEAD_GOTO(p, rerror, fail);
 
     while (p->output_index < p->output_length) {
-        if((clock_get_monotonic_seconds() - start_time) * 1000 >= timeout_ms)
+        if(clock_get_monotonic_seconds() - start_time >= timeout_seconds)
             return -1;
 
         if(!p->read_data) {
@@ -195,6 +198,15 @@ static int pa_sound_device_read(pa_handle *p) {
                 CHECK_DEAD_GOTO(p, rerror, fail);
                 continue;
             }
+
+            pa_operation_unref(pa_stream_update_timing_info(p->stream, NULL, NULL));
+            // TODO: Deal with one pa_stream_peek not being enough. In that case we need to add multiple of these together(?)
+            if(pa_stream_get_latency(p->stream, &latency, &negative) >= 0) {
+                p->latency_seconds = negative ? -(double)latency : latency;
+                if(p->latency_seconds < 0.0)
+                    p->latency_seconds = 0.0;
+                p->latency_seconds *= 0.0000001;
+            }
         }
 
         const size_t space_free_in_output_buffer = p->output_length - p->output_index;
@@ -254,11 +266,11 @@ int sound_device_get_by_name(SoundDevice *device, const char *device_name, const
     ss.channels = num_channels;
 
     pa_buffer_attr buffer_attr;
+    buffer_attr.fragsize = period_frame_size * audio_format_to_get_bytes_per_sample(audio_format) * num_channels; // 2/4 bytes/sample, @num_channels channels
     buffer_attr.tlength = -1;
     buffer_attr.prebuf = -1;
     buffer_attr.minreq = -1;
-    buffer_attr.maxlength = period_frame_size * audio_format_to_get_bytes_per_sample(audio_format) * num_channels; // 2/4 bytes/sample, @num_channels channels
-    buffer_attr.fragsize = buffer_attr.maxlength;
+    buffer_attr.maxlength = buffer_attr.fragsize;
 
     int error = 0;
     pa_handle *handle = pa_sound_device_new(nullptr, description, device_name, description, &ss, &buffer_attr, &error);
@@ -278,13 +290,15 @@ void sound_device_close(SoundDevice *device) {
     device->handle = NULL;
 }
 
-int sound_device_read_next_chunk(SoundDevice *device, void **buffer) {
+int sound_device_read_next_chunk(SoundDevice *device, void **buffer, double timeout_sec, double *latency_seconds) {
     pa_handle *pa = (pa_handle*)device->handle;
-    if(pa_sound_device_read(pa) < 0) {
+    if(pa_sound_device_read(pa, timeout_sec) < 0) {
         //fprintf(stderr, "pa_simple_read() failed: %s\n", pa_strerror(error));
+        *latency_seconds = 0.0;
         return -1;
     }
     *buffer = pa->output_data;
+    *latency_seconds = pa->latency_seconds;
     return device->frames;
 }