fix(client): update last buffer time in al source if samples write wa…

…s skipped
plasmoapp · Nov 16, 2024 · 19200b6 · 19200b6
1 parent 9359a30
commit 19200b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/api/client/src/main/java/su/plo/voice/api/client/audio/device/source/AlSource.java b/api/client/src/main/java/su/plo/voice/api/client/audio/device/source/AlSource.java
@@ -157,6 +157,11 @@ public interface AlSource extends DeviceSource {
      */
     void setCloseTimeoutMs(long timeoutMs);
 
+    /**
+     * Updates last buffer time to current time provided by the time supplier.
+     */
+    void updateLastBufferTime();
+
     /**
      * Gets the OpenAL format of the source.
      *

diff --git a/client/src/main/kotlin/su/plo/voice/client/audio/device/source/StreamAlSource.kt b/client/src/main/kotlin/su/plo/voice/client/audio/device/source/StreamAlSource.kt
@@ -99,6 +99,10 @@ class StreamAlSource private constructor(
         this.closeTimeoutMs = timeoutMs
     }
 
+    override fun updateLastBufferTime() {
+        lastBufferTime = timeSupplier.currentTimeMillis
+    }
+
     override fun write(samples: ShortArray, applyFilters: Boolean) {
         val processedSamples = if (applyFilters) {
             device.processFilters(samples)
@@ -202,7 +206,7 @@ class StreamAlSource private constructor(
             queueWithEmptyBuffers()
             fillQueue()
 
-            lastBufferTime = timeSupplier.currentTimeMillis
+            updateLastBufferTime()
             availableBuffer[0] = -1
 
             while (isStreaming.get()) {

diff --git a/client/src/main/kotlin/su/plo/voice/client/audio/source/BaseClientAudioSource.kt b/client/src/main/kotlin/su/plo/voice/client/audio/source/BaseClientAudioSource.kt
@@ -382,6 +382,8 @@ abstract class BaseClientAudioSource<T>(
             } catch (e: CodecException) {
                 BaseVoice.DEBUG_LOGGER.warn("Failed to decode source audio", e)
             }
+        } else {
+            source.updateLastBufferTime()
         }
 
         lastSequenceNumber = packet.sequenceNumber