Noisily log when a VideoRenderer is used without initializing it first (#478)

@@ -16,17 +16,45 @@
 
 
 package io.livekit.android.renderer
 package io.livekit.android.renderer
 
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context
 import android.util.AttributeSet
 import android.util.AttributeSet
+import android.util.Log
 import android.view.View
 import android.view.View
 import io.livekit.android.room.track.video.ViewVisibility
 import io.livekit.android.room.track.video.ViewVisibility
+import io.livekit.android.util.LKLog
+import livekit.org.webrtc.EglBase
+import livekit.org.webrtc.RendererCommon
 import livekit.org.webrtc.SurfaceViewRenderer
 import livekit.org.webrtc.SurfaceViewRenderer
+import livekit.org.webrtc.VideoFrame
 
 
 open class SurfaceViewRenderer : SurfaceViewRenderer, ViewVisibility.Notifier {
 open class SurfaceViewRenderer : SurfaceViewRenderer, ViewVisibility.Notifier {
     constructor(context: Context) : super(context)
     constructor(context: Context) : super(context)
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
 
     override var viewVisibility: ViewVisibility? = null
     override var viewVisibility: ViewVisibility? = null
+    private var initialized = false
+
+    override fun init(sharedContext: EglBase.Context?, rendererEvents: RendererCommon.RendererEvents?, configAttributes: IntArray?, drawer: RendererCommon.GlDrawer?) {
+        if (initialized) {
+            LKLog.w { "Reinitializing already initialized SurfaceViewRenderer." }
+        }
+        initialized = true
+        super.init(sharedContext, rendererEvents, configAttributes, drawer)
+    }
+
+    override fun release() {
+        initialized = false
+        super.release()
+    }
+
+    @SuppressLint("LogNotTimber")
+    override fun onFrame(frame: VideoFrame) {
+        if (!initialized) {
+            Log.e("SurfaceViewRenderer", "Received frame when not initialized! You must call Room.initVideoRenderer(view) before using this view!")
+        }
+        super.onFrame(frame)
+    }
 
 
     override fun onVisibilityChanged(changedView: View, visibility: Int) {
     override fun onVisibilityChanged(changedView: View, visibility: Int) {
         super.onVisibilityChanged(changedView, visibility)
         super.onVisibilityChanged(changedView, visibility)

@@ -9,16 +9,19 @@
  */
  */
 package io.livekit.android.renderer
 package io.livekit.android.renderer
 
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Context
 import android.content.res.Resources.NotFoundException
 import android.content.res.Resources.NotFoundException
 import android.graphics.Matrix
 import android.graphics.Matrix
 import android.graphics.SurfaceTexture
 import android.graphics.SurfaceTexture
 import android.os.Looper
 import android.os.Looper
 import android.util.AttributeSet
 import android.util.AttributeSet
+import android.util.Log
 import android.view.SurfaceHolder
 import android.view.SurfaceHolder
 import android.view.TextureView
 import android.view.TextureView
 import android.view.View
 import android.view.View
 import io.livekit.android.room.track.video.ViewVisibility
 import io.livekit.android.room.track.video.ViewVisibility
+import io.livekit.android.util.LKLog
 import livekit.org.webrtc.*
 import livekit.org.webrtc.*
 import livekit.org.webrtc.RendererCommon.*
 import livekit.org.webrtc.RendererCommon.*
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.CountDownLatch
@@ -47,6 +50,7 @@ open class TextureViewRenderer :
     private var enableFixedSize = false
     private var enableFixedSize = false
     private var surfaceWidth = 0
     private var surfaceWidth = 0
     private var surfaceHeight = 0
     private var surfaceHeight = 0
+    private var initialized = false
 
 
     /**
     /**
      * Standard View constructor. In order to render something, you must first call init().
      * Standard View constructor. In order to render something, you must first call init().
@@ -85,6 +89,12 @@ open class TextureViewRenderer :
         drawer: GlDrawer? = GlRectDrawer(),
         drawer: GlDrawer? = GlRectDrawer(),
     ) {
     ) {
         ThreadUtils.checkIsOnMainThread()
         ThreadUtils.checkIsOnMainThread()
+
+        if (initialized) {
+            LKLog.w { "Reinitializing already initialized TextureViewRenderer." }
+        }
+        initialized = true
+
         this.rendererEvents = rendererEvents
         this.rendererEvents = rendererEvents
         rotatedFrameWidth = 0
         rotatedFrameWidth = 0
         rotatedFrameHeight = 0
         rotatedFrameHeight = 0
@@ -98,6 +108,7 @@ open class TextureViewRenderer :
      * don't call this function, the GL resources might leak.
      * don't call this function, the GL resources might leak.
      */
      */
     fun release() {
     fun release() {
+        initialized = false
         eglRenderer.release()
         eglRenderer.release()
     }
     }
 
 
@@ -192,7 +203,11 @@ open class TextureViewRenderer :
     }
     }
 
 
     // VideoSink interface.
     // VideoSink interface.
+    @SuppressLint("LogNotTimber")
     override fun onFrame(frame: VideoFrame) {
     override fun onFrame(frame: VideoFrame) {
+        if (!initialized) {
+            Log.e("TextureViewRenderer", "Received frame when not initialized! You must call Room.initVideoRenderer(view) before using this view!")
+        }
         eglRenderer.onFrame(frame)
         eglRenderer.onFrame(frame)
     }
     }
 
 
@@ -360,7 +375,7 @@ open class TextureViewRenderer :
     }
     }
 
 
     companion object {
     companion object {
-        private const val TAG = "SurfaceViewRenderer"
+        private const val TAG = "TextureViewRenderer"
     }
     }
 
 
     override var viewVisibility: ViewVisibility? = null
     override var viewVisibility: ViewVisibility? = null