sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Composition preview: image renderer does not forward VideoSink events

Browse source 
PiperOrigin-RevId: 615479550
This commit is contained in:
christosts 2024-03-13 11:06:40 -07:00 committed by Copybara-Service
parent 668a172683
commit 5f6e5bcda2
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java
View file

@ -62,7 +62,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import org.checkerframework.checker.initialization.qual.Initialized; import org.checkerframework.checker.initialization.qual.Initialized;
@ -656,11 +655,6 @@ public final class CompositingVideoSinkProvider
@Override @Override
public void setListener(Listener listener, Executor executor) { public void setListener(Listener listener, Executor executor) {
if (Objects.equals(listener, this.listener)) {
checkState(Objects.equals(executor, listenerExecutor));
return;
}
this.listener = listener; this.listener = listener;
listenerExecutor = executor; listenerExecutor = executor;
} }

16
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java
View file

@ -122,22 +122,6 @@ public final class CompositingVideoSinkProviderTest {
.isEqualTo(2_000_000); .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() { private static CompositingVideoSinkProvider createCompositingVideoSinkProvider() {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
VideoFrameReleaseControl.FrameTimingEvaluator frameTimingEvaluator = VideoFrameReleaseControl.FrameTimingEvaluator frameTimingEvaluator =