From 6add3a1dbaf4f4dfb1e61b0216613b86aa9799ae Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Mon, 6 May 2024 00:58:59 -0700
Subject: [PATCH] Add release method to VideoSink

PiperOrigin-RevId: 630958612
---
 .../media3/exoplayer/video/CompositingVideoSinkProvider.java | 5 +++++
 .../media3/exoplayer/video/MediaCodecVideoRenderer.java      | 2 +-
 .../main/java/androidx/media3/exoplayer/video/VideoSink.java | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java
index bfe5fbca11..1c47410589 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java
@@ -764,6 +764,11 @@ public final class CompositingVideoSinkProvider
       }
     }
 
+    @Override
+    public void release() {
+      CompositingVideoSinkProvider.this.release();
+    }
+
     // Other methods
 
     /** Sets the {@linkplain Effect video effects}. */
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
index 6573deae90..d7386f8bfe 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
@@ -734,7 +734,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
   protected void onRelease() {
     super.onRelease();
     if (ownsVideoSinkProvider) {
-      videoSinkProvider.release();
+      videoSink.release();
     }
   }
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java
index 64abf81a1a..168d128724 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java
@@ -212,4 +212,7 @@ public interface VideoSink {
    * @throws VideoSinkException If an error occurs during rendering.
    */
   void render(long positionUs, long elapsedRealtimeUs) throws VideoSinkException;
+
+  /** Releases the sink. */
+  void release();
 }