Better pause logic + load chunk when seeking

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/player/AudioFileStreaming.java

@@ -202,14 +202,18 @@ public synchronized void reset() {
             }
 
             @Override
-            public synchronized long skip(long n) {
+            public synchronized long skip(long n) throws IOException {
                 long k = size - pos;
                 if (n < k) k = n < 0 ? 0 : n;
                 pos += k;
+
+                int chunk = pos / CHUNK_SIZE;
+                checkAvailability(chunk, false);
+
                 return k;
             }
 
-            private void checkAvailability(int chunk) throws IOException {
+            private void checkAvailability(int chunk, boolean wait) throws IOException {
                 if (!requested[chunk]) {
                     requestChunkFromStream(chunk);
                     requested[chunk] = true;
@@ -220,7 +224,7 @@ private void checkAvailability(int chunk) throws IOException {
                     requested[chunk + 1] = true;
                 }
 
-                if (!available[chunk])
+                if (wait && !available[chunk])
                     waitFor(chunk);
             }
 
@@ -240,7 +244,7 @@ public int read(@NotNull byte[] b, int off, int len) throws IOException {
                     int chunk = pos / CHUNK_SIZE;
                     int chunkOff = pos % CHUNK_SIZE;
 
-                    checkAvailability(chunk);
+                    checkAvailability(chunk, true);
 
                     int copy = Math.min(buffer[chunk].length - chunkOff, len - i);
                     System.arraycopy(buffer[chunk], chunkOff, b, off + i, copy);
@@ -258,7 +262,7 @@ public synchronized int read() throws IOException {
                     return -1;
 
                 int chunk = pos / CHUNK_SIZE;
-                checkAvailability(chunk);
+                checkAvailability(chunk, true);
 
                 return buffer[chunk][pos++ % CHUNK_SIZE] & 0xff;
             }

core/src/main/java/xyz/gianlu/librespot/player/PlayerRunner.java

@@ -41,6 +41,7 @@ public class PlayerRunner implements Runnable {
     private final Mixer mixer;
     private final Controller controller;
     private final int duration;
+    private final Object pauseLock = new Object();
     private byte[] buffer;
     private int count;
     private int index;
@@ -56,6 +57,7 @@ public class PlayerRunner implements Runnable {
     PlayerRunner(@NotNull AudioFileStreaming audioFile, @NotNull NormalizationData normalizationData,
                  @NotNull Player.PlayerConfiguration configuration, @NotNull Listener listener, int duration) throws IOException, PlayerException {
         this.audioIn = audioFile.stream();
+        this.duration = duration;
         this.listener = listener;
         this.normalizationFactor = normalizationData.getFactor(configuration);
         this.mixer = AudioSystem.getMixer(AudioSystem.getMixerInfo()[0]);
@@ -67,7 +69,6 @@ public class PlayerRunner implements Runnable {
         readHeader();
         initializeSound();
         this.controller = new Controller(outputLine);
-        this.duration = duration;
 
         audioIn.mark(-1);
 
@@ -185,20 +186,20 @@ private void readBody() throws PlayerException, IOException {
 
                 index = joggSyncState.buffer(BUFFER_SIZE);
                 buffer = joggSyncState.data;
-
                 if (index == -1)
                     break;
 
                 count = audioIn.read(buffer, index, BUFFER_SIZE);
                 joggSyncState.wrote(count);
-
                 if (count == 0)
                     break;
             } else {
                 outputLine.stop();
 
                 try {
-                    Thread.sleep(500);
+                    synchronized (pauseLock) {
+                        pauseLock.wait();
+                    }
                 } catch (InterruptedException ex) {
                     throw new RuntimeException(ex);
                 }
@@ -207,8 +208,6 @@ private void readBody() throws PlayerException, IOException {
     }
 
     private void decodeCurrentPacket() {
-        long granulepos = joggPacket.granulepos;
-
         if (jorbisBlock.synthesis(joggPacket) == 0)
             jorbisDspState.synthesis_blockin(jorbisBlock);
 
@@ -231,13 +230,14 @@ private void decodeCurrentPacket() {
                     convertedBuffer[sampleIndex] = (byte) (value);
                     convertedBuffer[sampleIndex + 1] = (byte) (value >>> 8);
 
-                    sampleIndex += 2 * (jorbisInfo.channels);
+                    sampleIndex += 2 * jorbisInfo.channels;
                 }
             }
 
             outputLine.write(convertedBuffer, 0, 2 * jorbisInfo.channels * range);
             jorbisDspState.synthesis_read(range);
 
+            long granulepos = joggPacket.granulepos;
             if (granulepos != -1 && joggPacket.e_o_s == 0) {
                 granulepos -= samples;
                 pcm_offset = granulepos;
@@ -247,7 +247,7 @@ private void decodeCurrentPacket() {
     }
 
     private void checkPreload() {
-        if (!calledPreload && (duration / 1000) - time() <= TRACK_PRELOAD_THRESHOLD) {
+        if (!calledPreload && !stopped && (duration / 1000) - time() <= TRACK_PRELOAD_THRESHOLD) {
             calledPreload = true;
             listener.preloadNextTrack();
         }
@@ -281,6 +281,9 @@ public void run() {
 
     void play() {
         playing = true;
+        synchronized (pauseLock) {
+            pauseLock.notifyAll();
+        }
     }
 
     void pause() {