From 638eae44ab718cb67a31c0f616a8e89a9cb72f8b Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Mon, 14 Oct 2024 02:31:42 -0700
Subject: [PATCH] Remove unnecessary method in VideoFrameRenderControl

PiperOrigin-RevId: 685632001
---
 .../androidx/media3/exoplayer/video/DefaultVideoSink.java  | 2 +-
 .../media3/exoplayer/video/VideoFrameReleaseControl.java   | 5 ++++-
 .../media3/exoplayer/video/VideoFrameRenderControl.java    | 7 -------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java
index 32d6d1be70..30fd2ff865 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/DefaultVideoSink.java
@@ -105,7 +105,7 @@ import java.util.concurrent.Executor;
 
   @Override
   public void setPlaybackSpeed(float speed) {
-    videoFrameRenderControl.setPlaybackSpeed(speed);
+    videoFrameReleaseControl.setPlaybackSpeed(speed);
   }
 
   @Override
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java
index 1ffa491e4e..ff9e88e523 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameReleaseControl.java
@@ -15,6 +15,7 @@
  */
 package androidx.media3.exoplayer.video;
 
+import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Util.msToUs;
 import static java.lang.Math.min;
 import static java.lang.annotation.ElementType.TYPE_USE;
@@ -22,6 +23,7 @@ import static java.lang.annotation.ElementType.TYPE_USE;
 import android.content.Context;
 import android.os.SystemClock;
 import android.view.Surface;
+import androidx.annotation.FloatRange;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
@@ -402,7 +404,8 @@ public final class VideoFrameReleaseControl {
   }
 
   /** Sets the playback speed. Called when the renderer playback speed changes. */
-  public void setPlaybackSpeed(float speed) {
+  public void setPlaybackSpeed(@FloatRange(from = 0, fromInclusive = false) float speed) {
+    checkArgument(speed > 0);
     if (speed == playbackSpeed) {
       return;
     }
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java
index ed8e089daf..16710225cd 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java
@@ -19,7 +19,6 @@ import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkStateNotNull;
 
-import androidx.annotation.FloatRange;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.VideoFrameProcessor;
@@ -138,12 +137,6 @@ import androidx.media3.exoplayer.ExoPlaybackException;
     return lastPresentationTimeUs != C.TIME_UNSET && lastPresentationTimeUs >= presentationTimeUs;
   }
 
-  /** Sets the playback speed. */
-  public void setPlaybackSpeed(@FloatRange(from = 0, fromInclusive = false) float speed) {
-    checkArgument(speed > 0);
-    videoFrameReleaseControl.setPlaybackSpeed(speed);
-  }
-
   /**
    * Incrementally renders available video frames.
    *