Review sleep constants and behavior

Author: natario1

lib/src/main/java/com/otaliastudios/transcoder/internal/Segment.kt

@@ -28,7 +28,7 @@ internal class Segment(
         when(val s = state ?: return false) {
             is State.Ok -> return false
             is State.Retry -> return false
-            is State.Wait -> return s.withSleep
+            is State.Wait -> return s.sleep
         }
     }
 

lib/src/main/java/com/otaliastudios/transcoder/internal/audio/AudioEngine.kt

@@ -63,10 +63,12 @@ internal class AudioEngine(
 
     override fun drain(): State<EncoderData> {
         if (chunks.isEmpty()) {
+            // nothing was enqueued
             log.i("drain(): no chunks, waiting...")
-            return State.Wait(true)
+            return State.Wait(false)
         }
         val (outBytes, outId) = next.buffer() ?: return run {
+            // dequeueInputBuffer failed
             log.i("drain(): no next buffer, waiting...")
             State.Wait(true)
         }

lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Decoder.kt

@@ -62,7 +62,7 @@ internal class Decoder(
     }
 
     override fun buffer(): Pair<ByteBuffer, Int>? {
-        val id = codec.dequeueInputBuffer(0)
+        val id = codec.dequeueInputBuffer(100)
         return if (id >= 0) {
             dequeuedInputs++
             buffers.getInputBuffer(id) to id
@@ -88,7 +88,7 @@ internal class Decoder(
     }
 
     override fun drain(): State<DecoderData> {
-        val result = codec.dequeueOutputBuffer(info, 0)
+        val result = codec.dequeueOutputBuffer(info, 100)
         return when (result) {
             INFO_TRY_AGAIN_LATER -> {
                 log.i("drain(): got INFO_TRY_AGAIN_LATER, waiting.")
@@ -116,6 +116,7 @@ internal class Decoder(
                     }
                     if (isEos) State.Eos(data) else State.Ok(data)
                 } else {
+                    // frame was dropped, no need to sleep
                     codec.releaseOutputBuffer(result, false)
                     State.Wait(false)
                 }.also {

lib/src/main/java/com/otaliastudios/transcoder/internal/codec/Encoder.kt

@@ -73,7 +73,7 @@ internal class Encoder(
     }
 
     override fun buffer(): Pair<ByteBuffer, Int>? {
-        val id = codec.dequeueInputBuffer(0)
+        val id = codec.dequeueInputBuffer(100)
         return if (id >= 0) {
             dequeuedInputs++
             buffers.getInputBuffer(id) to id
@@ -107,7 +107,7 @@ internal class Encoder(
     }
 
     override fun drain(): State<WriterData> {
-        val timeoutUs = if (eosReceivedButNotEnqueued) 5000L else 0L
+        val timeoutUs = if (eosReceivedButNotEnqueued) 5000L else 100L
         return when (val result = codec.dequeueOutputBuffer(info, timeoutUs)) {
             INFO_TRY_AGAIN_LATER -> {
                 if (eosReceivedButNotEnqueued) {

lib/src/main/java/com/otaliastudios/transcoder/internal/data/Reader.kt

@@ -27,6 +27,7 @@ internal class Reader(
     private inline fun nextBufferOrWait(action: (ByteBuffer, Int) -> State<ReaderData>): State<ReaderData> {
         val buffer = next.buffer()
         if (buffer == null) {
+            // dequeueInputBuffer failed
             log.v("Returning State.Wait because buffer is null.")
             return State.Wait(true)
         } else {

lib/src/main/java/com/otaliastudios/transcoder/internal/pipeline/Pipeline.kt

@@ -26,18 +26,26 @@ internal class Pipeline private constructor(name: String, private val chain: Lis
             if (index < head) return@forEachIndexed
             val fresh = head == 0 || index != head
 
-            when(val okOrWaitState = executeStep(state, step, fresh)) {
-                is State.Wait -> return State.Wait(okOrWaitState.withSleep)
-                is State.Ok -> state = okOrWaitState
-                is State.Retry -> throw RuntimeException("Unexpected")
+            fun executeStep(fresh: Boolean): State.Wait<Any>? {
+                return when (val newState = step.step(state, fresh)) {
+                    is State.Eos -> {
+                        state = newState
+                        log.i("execute(): EOS from ${step.name} (#$index/${chain.size}).")
+                        headState = newState
+                        headIndex = index + 1
+                        null
+                    }
+                    is State.Ok -> {
+                        state = newState
+                        null
+                    }
+                    is State.Retry -> executeStep(fresh = false)
+                    is State.Wait -> return newState
+                }
             }
 
-            // log.v("execute(): executed ${step.name} (#$index/${chain.size}). result=$state")
-            if (state is State.Eos) {
-                log.i("execute(): EOS from ${step.name} (#$index/${chain.size}).")
-                headState = state
-                headIndex = index + 1
-            }
+            val wait = executeStep(fresh)
+            if (wait != null) return State.Wait(wait.sleep)
         }
         return when {
             chain.isEmpty() -> State.Eos(Unit)
@@ -50,15 +58,6 @@ internal class Pipeline private constructor(name: String, private val chain: Lis
         chain.forEach { it.release() }
     }
 
-    private fun executeStep(previous: State.Ok<Any>, step: AnyStep, fresh: Boolean): State<Any> {
-        val state = step.step(previous, fresh)
-        return when (state) {
-            is State.Ok -> state
-            is State.Retry -> executeStep(previous, step, fresh = false)
-            is State.Wait -> state
-        }
-    }
-
     companion object {
         @Suppress("UNCHECKED_CAST")
         internal fun build(name: String, builder: () -> Builder<*, Channel> = { Builder<Unit, Channel>() }): Pipeline {

lib/src/main/java/com/otaliastudios/transcoder/internal/pipeline/State.kt

@@ -13,8 +13,8 @@ internal sealed class State<out T> {
     }
 
     // couldn't run, but might in the future
-    class Wait<T>(val withSleep: Boolean) : State<T>() {
-        override fun toString() = "State.Wait(withSleep: $withSleep)"
+    class Wait<T>(val sleep: Boolean) : State<T>() {
+        override fun toString() = "State.Wait($sleep)"
     }
 
     // call again as soon as possible

lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt

@@ -134,7 +134,7 @@ internal class DefaultThumbnailsEngine(
     }
 
     companion object {
-        private val WAIT_MS = 10L
+        private val WAIT_MS = 2L
         private val PROGRESS_LOOPS = 10L
     }
 }

lib/src/main/java/com/otaliastudios/transcoder/internal/transcode/DefaultTranscodeEngine.kt

@@ -149,7 +149,7 @@ internal class DefaultTranscodeEngine(
 
 
     companion object {
-        private val WAIT_MS = 10L
+        private val WAIT_MS = 2L
         private val PROGRESS_LOOPS = 10L
     }
 }