From 37cd008c014136b74b58b14000ef02b8dc045b29 Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 14 Oct 2024 06:08:01 -0700 Subject: [PATCH] Remove unnecessary method in VideoFrameRenderControl PiperOrigin-RevId: 685681192 --- .../exoplayer/video/PlaybackVideoGraphWrapper.java | 2 +- .../exoplayer/video/VideoFrameRenderControl.java | 5 ----- .../exoplayer/video/VideoFrameRenderControlTest.java | 12 ------------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java index 820dccdb51..a8ec59b725 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java @@ -420,7 +420,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video } private boolean isReady(boolean rendererOtherwiseReady) { - return videoFrameRenderControl.isReady( + return videoFrameReleaseControl.isReady( /* rendererOtherwiseReady= */ rendererOtherwiseReady && pendingFlushCount == 0); } 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 16710225cd..20346534ad 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 @@ -121,11 +121,6 @@ import androidx.media3.exoplayer.ExoPlaybackException; } } - /** Returns whether the renderer is ready. */ - public boolean isReady(boolean rendererOtherwiseReady) { - return videoFrameReleaseControl.isReady(rendererOtherwiseReady); - } - /** * Returns whether the renderer has released a frame after a specific presentation timestamp. * diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/VideoFrameRenderControlTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/VideoFrameRenderControlTest.java index 727f4dd57c..f4d26d00b2 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/VideoFrameRenderControlTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/VideoFrameRenderControlTest.java @@ -37,15 +37,6 @@ public class VideoFrameRenderControlTest { private static final int VIDEO_WIDTH = 640; private static final int VIDEO_HEIGHT = 480; - @Test - public void isReady_afterInstantiation_returnsFalse() { - VideoFrameRenderControl videoFrameRenderControl = - new VideoFrameRenderControl( - mock(VideoFrameRenderControl.FrameRenderer.class), createVideoFrameReleaseControl()); - - assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isFalse(); - } - @Test public void releaseFirstFrame() throws Exception { VideoFrameRenderControl.FrameRenderer frameRenderer = @@ -60,7 +51,6 @@ public class VideoFrameRenderControlTest { videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); - assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue(); InOrder inOrder = Mockito.inOrder(frameRenderer); inOrder .verify(frameRenderer) @@ -92,7 +82,6 @@ public class VideoFrameRenderControlTest { videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 10_000); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); - assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue(); InOrder inOrder = Mockito.inOrder(frameRenderer); inOrder .verify(frameRenderer) @@ -141,7 +130,6 @@ public class VideoFrameRenderControlTest { videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); - assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue(); InOrder inOrder = Mockito.inOrder(frameRenderer); inOrder .verify(frameRenderer)