Fix simulcast factory not sending back EncoderInfo (#67)

livekit · Mar 24, 2022 · 7b38cd4 · 7b38cd4
1 parent 0ffff8b
commit 7b38cd4
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/...ndroid-sdk/src/main/java/io/livekit/android/webrtc/SimulcastVideoEncoderFactoryWrapper.kt b/...ndroid-sdk/src/main/java/io/livekit/android/webrtc/SimulcastVideoEncoderFactoryWrapper.kt
@@ -2,7 +2,9 @@ package io.livekit.android.webrtc
 
 import io.livekit.android.util.LKLog
 import org.webrtc.*
-import java.util.concurrent.*
+import java.util.concurrent.Callable
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
 
 /*
 Copyright 2017, Lyo Kato <lyo.kato at gmail.com> (Original Author)
@@ -49,7 +51,7 @@ internal class SimulcastVideoEncoderFactoryWrapper(
      * This results in HardwareVideoEncoderFactory being both the primary and fallback,
      * but there aren't any specific problems in doing so.
      */
-    private class Fallback(private val hardwareVideoEncoderFactory: VideoEncoderFactory) :
+    private class FallbackFactory(private val hardwareVideoEncoderFactory: VideoEncoderFactory) :
         VideoEncoderFactory {
 
         private val softwareVideoEncoderFactory: VideoEncoderFactory = SoftwareVideoEncoderFactory()
@@ -93,6 +95,7 @@ internal class SimulcastVideoEncoderFactoryWrapper(
             val future = executor.submit(Callable {
                 LKLog.i {
                     """initEncode() thread=${Thread.currentThread().name} [${Thread.currentThread().id}]
+                |  encoder=${encoder.implementationName}
                 |  streamSettings:
                 |    numberOfCores=${settings.numberOfCores}
                 |    width=${settings.width}
@@ -165,6 +168,31 @@ internal class SimulcastVideoEncoderFactoryWrapper(
             val future = executor.submit(Callable { return@Callable encoder.implementationName })
             return future.get()
         }
+
+        override fun createNativeVideoEncoder(): Long {
+            val future = executor.submit(Callable { return@Callable encoder.createNativeVideoEncoder() })
+            return future.get()
+        }
+
+        override fun isHardwareEncoder(): Boolean {
+            val future = executor.submit(Callable { return@Callable encoder.isHardwareEncoder })
+            return future.get()
+        }
+
+        override fun setRates(rcParameters: VideoEncoder.RateControlParameters?): VideoCodecStatus {
+            val future = executor.submit(Callable { return@Callable encoder.setRates(rcParameters) })
+            return future.get()
+        }
+
+        override fun getResolutionBitrateLimits(): Array<VideoEncoder.ResolutionBitrateLimits> {
+            val future = executor.submit(Callable { return@Callable encoder.resolutionBitrateLimits })
+            return future.get()
+        }
+
+        override fun getEncoderInfo(): VideoEncoder.EncoderInfo {
+            val future = executor.submit(Callable { return@Callable encoder.encoderInfo })
+            return future.get()
+        }
     }
 
     private class StreamEncoderWrapperFactory(private val factory: VideoEncoderFactory) :
@@ -195,7 +223,7 @@ internal class SimulcastVideoEncoderFactoryWrapper(
             sharedContext, enableIntelVp8Encoder, enableH264HighProfile
         )
         primary = StreamEncoderWrapperFactory(hardwareVideoEncoderFactory)
-        fallback = StreamEncoderWrapperFactory(Fallback(primary))
+        fallback = StreamEncoderWrapperFactory(FallbackFactory(primary))
         native = SimulcastVideoEncoderFactory(primary, fallback)
     }