Fix surface reuse issues and logging

crunchyroll · May 30, 2023 · e8a7c50 · e8a7c50
1 parent 768eef6
commit e8a7c50
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
@@ -131,6 +131,7 @@ public void setAdOverlay(FrameLayout adOverlay) {
     }
 
     private void clearVideoView() {
+        Log.w("RNV", "clearVideoView()");
         if (surfaceView instanceof TextureView) {
             player.clearVideoTextureView((TextureView) surfaceView);
         } else if (surfaceView instanceof SurfaceView) {
@@ -139,6 +140,7 @@ private void clearVideoView() {
     }
 
     private void setVideoView() {
+        Log.w("RNV", "setVideoView()");
         if (surfaceView instanceof TextureView) {
             player.setVideoTextureView((TextureView) surfaceView);
         } else if (surfaceView instanceof SurfaceView) {
@@ -148,19 +150,27 @@ private void setVideoView() {
 
     private void updateSurfaceView() {
         View view;
+        Log.w("RNV", "DEBUG1");
         if (!useTextureView || useSecureView) {
-            if (surfaceView instanceof TextureView) {
+            Log.w("RNV", "DEBUG2");
+            if (surfaceView != null && surfaceView instanceof SurfaceView) {
+                Log.w("RNV", "DEBUG3");
                 view = surfaceView;
             } else {
+                Log.w("RNV", "DEBUG4");
                 view = new SurfaceView(context);
             }
             if (useSecureView) {
+                Log.w("RNV", "DEBUG5");
                 ((SurfaceView)view).setSecure(true);
             }
         } else {
-            if (surfaceView instanceof TextureView) {
+            Log.w("RNV", "DEBUG6");
+            if (surfaceView != null && surfaceView instanceof TextureView) {
+                Log.w("RNV", "DEBUG7");
                 view = surfaceView;
             } else {
+                Log.w("RNV", "DEBUG8");
                 view = new TextureView(context);
             }
         }
@@ -173,6 +183,7 @@ private void updateSurfaceView() {
         layout.addView(surfaceView, 0, layoutParams);
 
         if (this.player != null) {
+            Log.w("RNV", "DEBUG9");
             setVideoView();
         }
     }