OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 package org.appspot.apprtc.test; | 11 package org.appspot.apprtc.test; |
12 | 12 |
13 import org.appspot.apprtc.AppRTCClient.SignalingParameters; | 13 import org.appspot.apprtc.AppRTCClient.SignalingParameters; |
14 import org.appspot.apprtc.PeerConnectionClient; | 14 import org.appspot.apprtc.PeerConnectionClient; |
15 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionEvents; | 15 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionEvents; |
16 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters; | 16 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters; |
17 | 17 |
18 import android.os.Build; | 18 import android.os.Build; |
| 19 import android.test.FlakyTest; |
19 import android.test.InstrumentationTestCase; | 20 import android.test.InstrumentationTestCase; |
20 import android.test.suitebuilder.annotation.SmallTest; | 21 import android.test.suitebuilder.annotation.SmallTest; |
21 import android.util.Log; | 22 import android.util.Log; |
22 | 23 |
23 import org.webrtc.Camera2Enumerator; | 24 import org.webrtc.Camera2Enumerator; |
24 import org.webrtc.EglBase; | 25 import org.webrtc.EglBase; |
25 import org.webrtc.IceCandidate; | 26 import org.webrtc.IceCandidate; |
26 import org.webrtc.MediaCodecVideoEncoder; | 27 import org.webrtc.MediaCodecVideoEncoder; |
27 import org.webrtc.PeerConnection; | 28 import org.webrtc.PeerConnection; |
28 import org.webrtc.PeerConnectionFactory; | 29 import org.webrtc.PeerConnectionFactory; |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
544 assertTrue("Remote video frames were not rendered after camera switch.", | 545 assertTrue("Remote video frames were not rendered after camera switch.", |
545 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 546 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
546 } | 547 } |
547 pcClient.close(); | 548 pcClient.close(); |
548 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); | 549 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); |
549 Log.d(TAG, "testCameraSwitch done."); | 550 Log.d(TAG, "testCameraSwitch done."); |
550 } | 551 } |
551 | 552 |
552 // Checks if video source can be restarted - simulate app goes to | 553 // Checks if video source can be restarted - simulate app goes to |
553 // background and back to foreground. | 554 // background and back to foreground. |
554 @SmallTest | 555 // Disabled because of https://bugs.chromium.org/p/webrtc/issues/detail?id=647
8 |
| 556 @FlakyTest |
| 557 //@SmallTest |
555 public void testVideoSourceRestart() throws InterruptedException { | 558 public void testVideoSourceRestart() throws InterruptedException { |
556 Log.d(TAG, "testVideoSourceRestart"); | 559 Log.d(TAG, "testVideoSourceRestart"); |
557 loopback = true; | 560 loopback = true; |
558 | 561 |
559 MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_R
ENDERER_NAME); | 562 MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_R
ENDERER_NAME); |
560 MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE
_RENDERER_NAME); | 563 MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE
_RENDERER_NAME); |
561 | 564 |
562 pcClient = createPeerConnectionClient( | 565 pcClient = createPeerConnectionClient( |
563 localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_
VP8, false), null); | 566 localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_
VP8, false), null); |
564 | 567 |
(...skipping 26 matching lines...) Expand all Loading... |
591 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 594 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
592 assertTrue("Remote video frames were not rendered after video restart.", | 595 assertTrue("Remote video frames were not rendered after video restart.", |
593 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 596 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
594 } | 597 } |
595 pcClient.close(); | 598 pcClient.close(); |
596 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); | 599 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); |
597 Log.d(TAG, "testVideoSourceRestart done."); | 600 Log.d(TAG, "testVideoSourceRestart done."); |
598 } | 601 } |
599 | 602 |
600 // Checks if capture format can be changed on fly and decoder can be reset pro
perly. | 603 // Checks if capture format can be changed on fly and decoder can be reset pro
perly. |
601 @SmallTest | 604 // Disabled because of https://bugs.chromium.org/p/webrtc/issues/detail?id=647
8 |
| 605 @FlakyTest |
| 606 //@SmallTest |
602 public void testCaptureFormatChange() throws InterruptedException { | 607 public void testCaptureFormatChange() throws InterruptedException { |
603 Log.d(TAG, "testCaptureFormatChange"); | 608 Log.d(TAG, "testCaptureFormatChange"); |
604 loopback = true; | 609 loopback = true; |
605 | 610 |
606 MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_R
ENDERER_NAME); | 611 MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_R
ENDERER_NAME); |
607 MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE
_RENDERER_NAME); | 612 MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE
_RENDERER_NAME); |
608 | 613 |
609 pcClient = createPeerConnectionClient( | 614 pcClient = createPeerConnectionClient( |
610 localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_
VP8, false), null); | 615 localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_
VP8, false), null); |
611 | 616 |
(...skipping 28 matching lines...) Expand all Loading... |
640 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 645 localRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
641 assertTrue("Remote video frames were not rendered after capture format cha
nge.", | 646 assertTrue("Remote video frames were not rendered after capture format cha
nge.", |
642 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); | 647 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); |
643 } | 648 } |
644 | 649 |
645 pcClient.close(); | 650 pcClient.close(); |
646 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); | 651 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); |
647 Log.d(TAG, "testCaptureFormatChange done."); | 652 Log.d(TAG, "testCaptureFormatChange done."); |
648 } | 653 } |
649 } | 654 } |
OLD | NEW |