Bug 1472: Enhance AV Sync: Pass through PTS object in AudioSink, tracking last PTS value against System Clock Reference (SCR)

This allows passing through actual SCR with the PTS when enqueueing audio frames
and utilizing it when querying actual time lapsed PTS value (interpolation SCR to currentMillis).

2 files changed, 16 insertions, 8 deletions

diff --git a/src/java/jogamp/common/av/JavaSoundAudioSink.java b/src/java/jogamp/common/av/JavaSoundAudioSink.java
index 556ada4..c556e92 100644
--- a/src/java/jogamp/common/av/JavaSoundAudioSink.java
+++ b/src/java/jogamp/common/av/JavaSoundAudioSink.java
@@ -36,6 +36,9 @@ import javax.sound.sampled.SourceDataLine;
 
 import com.jogamp.common.av.AudioFormat;
 import com.jogamp.common.av.AudioSink;
+import com.jogamp.common.av.PTS;
+import com.jogamp.common.av.TimeFrameI;
+import com.jogamp.common.os.Clock;
 
 /***
  * JavaSound Audio Sink
@@ -65,8 +68,8 @@ public final class JavaSoundAudioSink implements AudioSink {
     private int userMaxChannels = 8;
     private AudioFormat preferredFormat = null;
     private AudioFormat chosenFormat = null;
-
     private volatile boolean playRequested = false;
+    private final PTS pts = new PTS( () -> { return playRequested ? 1f : 0f; } );
     private float volume = 1.0f;
 
     static {
@@ -243,6 +246,7 @@ public final class JavaSoundAudioSink implements AudioSink {
     public void flush() {
         if( null != auline ) {
             playRequested = false;
+            pts.set(0, TimeFrameI.INVALID_PTS);
             auline.stop();
             auline.flush();
         }
@@ -290,6 +294,7 @@ public final class JavaSoundAudioSink implements AudioSink {
             bytesLeft -= len;
             written += len;
         }
+        this.pts.set(Clock.currentMillis(), pts);
         playImpl();
         return new AudioDataFrame(pts, Math.round(1000f*chosenFormat.getBytesDuration(byteCount)), byteBuffer, byteCount);
     }
@@ -315,10 +320,10 @@ public final class JavaSoundAudioSink implements AudioSink {
     }
 
     @Override
-    public final int getPTS() { return 0; } // FIXME
+    public final PTS getPTS() { return pts; }
 
     @Override
-    public final int updateQueue() { return 0; } // FIXME
+    public final PTS updateQueue() { return pts; } // FIXME
 
     @Override
     public int getLastBufferedPTS() { return 0; } // FIXME
diff --git a/src/java/jogamp/common/av/NullAudioSink.java b/src/java/jogamp/common/av/NullAudioSink.java
index d38c040..abc610f 100644
--- a/src/java/jogamp/common/av/NullAudioSink.java
+++ b/src/java/jogamp/common/av/NullAudioSink.java
@@ -31,12 +31,15 @@ import java.nio.ByteBuffer;
 
 import com.jogamp.common.av.AudioFormat;
 import com.jogamp.common.av.AudioSink;
+import com.jogamp.common.av.PTS;
+import com.jogamp.common.av.TimeFrameI;
+import com.jogamp.common.os.Clock;
 
 public final class NullAudioSink implements AudioSink {
 
     private volatile float playSpeed = 1.0f;
     private volatile boolean playRequested = false;
-    private volatile int playingPTS = AudioFrame.INVALID_PTS;
+    private final PTS pts = new PTS( () -> { return playRequested ? 1f : 0f; } );
     private float volume = 1.0f;
 
     private AudioFormat chosenFormat;
@@ -153,7 +156,7 @@ public final class NullAudioSink implements AudioSink {
     }
 
     @Override
-    public void flush() { }
+    public void flush() { pts.set(0, TimeFrameI.INVALID_PTS); }
 
     @Override
     public void destroy() {
@@ -180,10 +183,10 @@ public final class NullAudioSink implements AudioSink {
     public float getAvgFrameDuration() { return 0f; }
 
     @Override
-    public final int getPTS() { return playingPTS; }
+    public final PTS getPTS() { return pts; }
 
     @Override
-    public final int updateQueue() { return playingPTS; }
+    public final PTS updateQueue() { return pts; }
 
     @Override
     public int getLastBufferedPTS() { return 0; }
@@ -196,7 +199,7 @@ public final class NullAudioSink implements AudioSink {
         if( !available || null == chosenFormat ) {
             return null;
         }
-        playingPTS = pts;
+        this.pts.set(Clock.currentMillis(), pts);
         return null;
     }
 }