Support switching between Surface and VideoDecoderOutputBufferRenderer

Clear state for one mode when entering the other in both SimpleExoPlayer
and SimpleDecoderVideoRenderer. The latter is redundant for the case of
renderers that are used inside SimpleExoPlayer, but seems nice to have.

- Entering Surface mode means receiving a non-null Surface, SurfaceHolder
  or TextureView in SimpleExoPlayer, or a non-null Surface in
  SimpleDecoderVideoRenderer.
- Entering VideoDecoderOutputBufferRenderer means receiving a non-null
  VideoDecoderOutputBufferRenderer in SimpleExoPlayer and
  SimpleDecoderVideoRenderer.

PiperOrigin-RevId: 280155151

library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java

@@ -517,14 +517,16 @@ public class SimpleExoPlayer extends BasePlayer
   @Override
   @Override
   public void clearVideoSurface() {
   public void clearVideoSurface() {
     verifyApplicationThread();
     verifyApplicationThread();
-    setVideoSurface(null);
+    removeSurfaceCallbacks();
+    setVideoSurfaceInternal(/* surface= */ null, /* ownsSurface= */ false);
+    maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
   }
   }
 
 
   @Override
   @Override
   public void clearVideoSurface(@Nullable Surface surface) {
   public void clearVideoSurface(@Nullable Surface surface) {
     verifyApplicationThread();
     verifyApplicationThread();
     if (surface != null && surface == this.surface) {
     if (surface != null && surface == this.surface) {
-      setVideoSurface(null);
+      clearVideoSurface();
     }
     }
   }
   }
 
 
@@ -532,7 +534,10 @@ public class SimpleExoPlayer extends BasePlayer
   public void setVideoSurface(@Nullable Surface surface) {
   public void setVideoSurface(@Nullable Surface surface) {
     verifyApplicationThread();
     verifyApplicationThread();
     removeSurfaceCallbacks();
     removeSurfaceCallbacks();
-    setVideoSurfaceInternal(surface, false);
+    if (surface != null) {
+      clearVideoDecoderOutputBufferRenderer();
+    }
+    setVideoSurfaceInternal(surface, /* ownsSurface= */ false);
     int newSurfaceSize = surface == null ? 0 : C.LENGTH_UNSET;
     int newSurfaceSize = surface == null ? 0 : C.LENGTH_UNSET;
     maybeNotifySurfaceSizeChanged(/* width= */ newSurfaceSize, /* height= */ newSurfaceSize);
     maybeNotifySurfaceSizeChanged(/* width= */ newSurfaceSize, /* height= */ newSurfaceSize);
   }
   }
@@ -541,9 +546,12 @@ public class SimpleExoPlayer extends BasePlayer
   public void setVideoSurfaceHolder(@Nullable SurfaceHolder surfaceHolder) {
   public void setVideoSurfaceHolder(@Nullable SurfaceHolder surfaceHolder) {
     verifyApplicationThread();
     verifyApplicationThread();
     removeSurfaceCallbacks();
     removeSurfaceCallbacks();
+    if (surfaceHolder != null) {
+      clearVideoDecoderOutputBufferRenderer();
+    }
     this.surfaceHolder = surfaceHolder;
     this.surfaceHolder = surfaceHolder;
     if (surfaceHolder == null) {
     if (surfaceHolder == null) {
-      setVideoSurfaceInternal(null, false);
+      setVideoSurfaceInternal(null, /* ownsSurface= */ false);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
     } else {
     } else {
       surfaceHolder.addCallback(componentListener);
       surfaceHolder.addCallback(componentListener);
@@ -581,9 +589,12 @@ public class SimpleExoPlayer extends BasePlayer
   public void setVideoTextureView(@Nullable TextureView textureView) {
   public void setVideoTextureView(@Nullable TextureView textureView) {
     verifyApplicationThread();
     verifyApplicationThread();
     removeSurfaceCallbacks();
     removeSurfaceCallbacks();
+    if (textureView != null) {
+      clearVideoDecoderOutputBufferRenderer();
+    }
     this.textureView = textureView;
     this.textureView = textureView;
     if (textureView == null) {
     if (textureView == null) {
-      setVideoSurfaceInternal(null, true);
+      setVideoSurfaceInternal(/* surface= */ null, /* ownsSurface= */ true);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
     } else {
     } else {
       if (textureView.getSurfaceTextureListener() != null) {
       if (textureView.getSurfaceTextureListener() != null) {
@@ -614,7 +625,9 @@ public class SimpleExoPlayer extends BasePlayer
   public void setVideoDecoderOutputBufferRenderer(
   public void setVideoDecoderOutputBufferRenderer(
       @Nullable VideoDecoderOutputBufferRenderer videoDecoderOutputBufferRenderer) {
       @Nullable VideoDecoderOutputBufferRenderer videoDecoderOutputBufferRenderer) {
     verifyApplicationThread();
     verifyApplicationThread();
-    setVideoSurface(null);
+    if (videoDecoderOutputBufferRenderer != null) {
+      clearVideoSurface();
+    }
     setVideoDecoderOutputBufferRendererInternal(videoDecoderOutputBufferRenderer);
     setVideoDecoderOutputBufferRendererInternal(videoDecoderOutputBufferRenderer);
   }
   }
 
 
@@ -630,7 +643,7 @@ public class SimpleExoPlayer extends BasePlayer
     verifyApplicationThread();
     verifyApplicationThread();
     if (videoDecoderOutputBufferRenderer != null
     if (videoDecoderOutputBufferRenderer != null
         && videoDecoderOutputBufferRenderer == this.videoDecoderOutputBufferRenderer) {
         && videoDecoderOutputBufferRenderer == this.videoDecoderOutputBufferRenderer) {
-      setVideoDecoderOutputBufferRendererInternal(/* videoDecoderOutputBufferRenderer= */ null);
+      clearVideoDecoderOutputBufferRenderer();
     }
     }
   }
   }
 
 
@@ -1729,7 +1742,7 @@ public class SimpleExoPlayer extends BasePlayer
 
 
     @Override
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
     public void surfaceDestroyed(SurfaceHolder holder) {
-      setVideoSurfaceInternal(null, false);
+      setVideoSurfaceInternal(/* surface= */ null, /* ownsSurface= */ false);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
     }
     }
 
 
@@ -1737,7 +1750,7 @@ public class SimpleExoPlayer extends BasePlayer
 
 
     @Override
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) {
     public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) {
-      setVideoSurfaceInternal(new Surface(surfaceTexture), true);
+      setVideoSurfaceInternal(new Surface(surfaceTexture), /* ownsSurface= */ true);
       maybeNotifySurfaceSizeChanged(width, height);
       maybeNotifySurfaceSizeChanged(width, height);
     }
     }
 
 
@@ -1748,7 +1761,7 @@ public class SimpleExoPlayer extends BasePlayer
 
 
     @Override
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
-      setVideoSurfaceInternal(null, true);
+      setVideoSurfaceInternal(/* surface= */ null, /* ownsSurface= */ true);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
       maybeNotifySurfaceSizeChanged(/* width= */ 0, /* height= */ 0);
       return true;
       return true;
     }
     }

library/core/src/main/java/com/google/android/exoplayer2/video/SimpleDecoderVideoRenderer.java

@@ -580,6 +580,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
       // The output has changed.
       // The output has changed.
       this.surface = surface;
       this.surface = surface;
       if (surface != null) {
       if (surface != null) {
+        outputBufferRenderer = null;
         outputMode = C.VIDEO_OUTPUT_MODE_SURFACE_YUV;
         outputMode = C.VIDEO_OUTPUT_MODE_SURFACE_YUV;
         if (decoder != null) {
         if (decoder != null) {
           setDecoderOutputMode(outputMode);
           setDecoderOutputMode(outputMode);
@@ -608,6 +609,7 @@ public abstract class SimpleDecoderVideoRenderer extends BaseRenderer {
       // The output has changed.
       // The output has changed.
       this.outputBufferRenderer = outputBufferRenderer;
       this.outputBufferRenderer = outputBufferRenderer;
       if (outputBufferRenderer != null) {
       if (outputBufferRenderer != null) {
+        surface = null;
         outputMode = C.VIDEO_OUTPUT_MODE_YUV;
         outputMode = C.VIDEO_OUTPUT_MODE_YUV;
         if (decoder != null) {
         if (decoder != null) {
           setDecoderOutputMode(outputMode);
           setDecoderOutputMode(outputMode);