From e468ba77ae6dc4a8bc21841097557743e49588ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Tue, 31 Jul 2018 16:50:00 +0200 Subject: [PATCH] Delete MockRenderer and replace it with identical MockSink class. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was left by a mistake in a previous refactoring. R=magjed Bug: None Change-Id: Ia2b469e730844780fa3b9ce5540d4bdd4d10b556 Reviewed-on: https://webrtc-review.googlesource.com/91480 Reviewed-by: Magnus Jedvert Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#24169} --- .../apprtc/test/PeerConnectionClientTest.java | 65 +++---------------- 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java index 29b59d795b..ec06bb9dde 100644 --- a/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java +++ b/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java @@ -84,53 +84,6 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { private final Object iceConnectedEvent = new Object(); private final Object closeEvent = new Object(); - // Mock renderer implementation. - private static class MockRenderer implements VideoSink { - // These are protected by 'this' since we gets called from worker threads. - private String rendererName; - private boolean renderFrameCalled = false; - - // Thread-safe in itself. - private CountDownLatch doneRendering; - - public MockRenderer(int expectedFrames, String rendererName) { - this.rendererName = rendererName; - reset(expectedFrames); - } - - // Resets render to wait for new amount of video frames. - // TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression. - @SuppressWarnings("NoSynchronizedMethodCheck") - public synchronized void reset(int expectedFrames) { - renderFrameCalled = false; - doneRendering = new CountDownLatch(expectedFrames); - } - - @Override - // TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression. - @SuppressWarnings("NoSynchronizedMethodCheck") - public synchronized void onFrame(VideoFrame frame) { - if (!renderFrameCalled) { - if (rendererName != null) { - Log.d(TAG, - rendererName + " render frame: " + frame.getRotatedWidth() + " x " - + frame.getRotatedHeight()); - } else { - Log.d(TAG, "Render frame: " + frame.getRotatedWidth() + " x " + frame.getRotatedHeight()); - } - } - renderFrameCalled = true; - doneRendering.countDown(); - } - - // This method shouldn't hold any locks or touch member variables since it - // blocks. - public boolean waitForFramesRendered(int timeoutMs) throws InterruptedException { - doneRendering.await(timeoutMs, TimeUnit.MILLISECONDS); - return (doneRendering.getCount() <= 0); - } - } - // Mock VideoSink implementation. private static class MockSink implements VideoSink { // These are protected by 'this' since we gets called from worker threads. @@ -305,9 +258,8 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { } } - PeerConnectionClient createPeerConnectionClient(MockSink localRenderer, - MockRenderer remoteRenderer, PeerConnectionParameters peerConnectionParameters, - VideoCapturer videoCapturer) { + PeerConnectionClient createPeerConnectionClient(MockSink localRenderer, MockSink remoteRenderer, + PeerConnectionParameters peerConnectionParameters, VideoCapturer videoCapturer) { List iceServers = new ArrayList<>(); SignalingParameters signalingParameters = new SignalingParameters(iceServers, true, // iceServers, initiator. @@ -402,7 +354,8 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { public void testSetLocalOfferMakesVideoFlowLocally() throws InterruptedException { Log.d(TAG, "testSetLocalOfferMakesVideoFlowLocally"); MockSink localRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME); - pcClient = createPeerConnectionClient(localRenderer, new MockRenderer(0, null), + pcClient = createPeerConnectionClient(localRenderer, + new MockSink(/* expectedFrames= */ 0, /* rendererName= */ null), createParametersForVideoCall(VIDEO_CODEC_VP8), createCameraCapturer(false /* captureToTexture */)); @@ -424,11 +377,11 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { boolean decodeToTexture) throws InterruptedException { loopback = true; MockSink localRenderer = null; - MockRenderer remoteRenderer = null; + MockSink remoteRenderer = null; if (parameters.videoCallEnabled) { Log.d(TAG, "testLoopback for video " + parameters.videoCodec); localRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME); - remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); + remoteRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); } else { Log.d(TAG, "testLoopback for audio."); } @@ -551,7 +504,7 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { loopback = true; MockSink localRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME); - MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); + MockSink remoteRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8), @@ -599,7 +552,7 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { loopback = true; MockSink localRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME); - MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); + MockSink remoteRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8), @@ -648,7 +601,7 @@ public class PeerConnectionClientTest implements PeerConnectionEvents { loopback = true; MockSink localRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME); - MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); + MockSink remoteRenderer = new MockSink(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME); pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8),