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 fa5203917f..0ae30edae5 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 @@ -62,7 +62,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.Executor; import org.checkerframework.checker.initialization.qual.Initialized; @@ -656,11 +655,6 @@ public final class CompositingVideoSinkProvider @Override public void setListener(Listener listener, Executor executor) { - if (Objects.equals(listener, this.listener)) { - checkState(Objects.equals(executor, listenerExecutor)); - return; - } - this.listener = listener; listenerExecutor = executor; } diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java index aa333d499e..7433cda17b 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java @@ -122,22 +122,6 @@ public final class CompositingVideoSinkProviderTest { .isEqualTo(2_000_000); } - @Test - public void setListener_calledTwiceWithDifferentExecutor_throws() - throws VideoSink.VideoSinkException { - CompositingVideoSinkProvider provider = createCompositingVideoSinkProvider(); - provider.setVideoEffects(ImmutableList.of()); - provider.initialize(new Format.Builder().build()); - VideoSink videoSink = provider.getSink(); - VideoSink.Listener listener = Mockito.mock(VideoSink.Listener.class); - - videoSink.setListener(listener, /* executor= */ command -> {}); - - assertThrows( - IllegalStateException.class, - () -> videoSink.setListener(listener, /* executor= */ command -> {})); - } - private static CompositingVideoSinkProvider createCompositingVideoSinkProvider() { Context context = ApplicationProvider.getApplicationContext(); VideoFrameReleaseControl.FrameTimingEvaluator frameTimingEvaluator =