loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary method in VideoFrameRenderControl

Browse Source 
PiperOrigin-RevId: 685681192
This commit is contained in:
kimvde 2024-10-14 06:08:01 -07:00 committed by Copybara-Service
parent 1c4ee06ad6
commit 37cd008c01
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/PlaybackVideoGraphWrapper.java
View File

@ -420,7 +420,7 @@ public final class PlaybackVideoGraphWrapper implements VideoSinkProvider, Video
} }
private boolean isReady(boolean rendererOtherwiseReady) { private boolean isReady(boolean rendererOtherwiseReady) {
return videoFrameRenderControl.isReady( return videoFrameReleaseControl.isReady(
/* rendererOtherwiseReady= */ rendererOtherwiseReady && pendingFlushCount == 0); /* rendererOtherwiseReady= */ rendererOtherwiseReady && pendingFlushCount == 0);
} }

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoFrameRenderControl.java
View File

@ -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. * Returns whether the renderer has released a frame after a specific presentation timestamp.
* *

12
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/VideoFrameRenderControlTest.java
View File

@ -37,15 +37,6 @@ public class VideoFrameRenderControlTest {
private static final int VIDEO_WIDTH = 640; private static final int VIDEO_WIDTH = 640;
private static final int VIDEO_HEIGHT = 480; 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 @Test
public void releaseFirstFrame() throws Exception { public void releaseFirstFrame() throws Exception {
VideoFrameRenderControl.FrameRenderer frameRenderer = VideoFrameRenderControl.FrameRenderer frameRenderer =
@ -60,7 +51,6 @@ public class VideoFrameRenderControlTest {
videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0); videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0);
videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0);
assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue();
InOrder inOrder = Mockito.inOrder(frameRenderer); InOrder inOrder = Mockito.inOrder(frameRenderer);
inOrder inOrder
.verify(frameRenderer) .verify(frameRenderer)
@ -92,7 +82,6 @@ public class VideoFrameRenderControlTest {
videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 10_000); videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 10_000);
videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0);
assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue();
InOrder inOrder = Mockito.inOrder(frameRenderer); InOrder inOrder = Mockito.inOrder(frameRenderer);
inOrder inOrder
.verify(frameRenderer) .verify(frameRenderer)
@ -141,7 +130,6 @@ public class VideoFrameRenderControlTest {
videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0); videoFrameRenderControl.onOutputFrameAvailableForRendering(/* presentationTimeUs= */ 0);
videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0); videoFrameRenderControl.render(/* positionUs= */ 0, /* elapsedRealtimeUs= */ 0);
assertThat(videoFrameRenderControl.isReady(/* rendererOtherwiseReady= */ true)).isTrue();
InOrder inOrder = Mockito.inOrder(frameRenderer); InOrder inOrder = Mockito.inOrder(frameRenderer);
inOrder inOrder
.verify(frameRenderer) .verify(frameRenderer)