Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1067)

Side by Side Diff: webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java

Issue 1785613011: Revert of Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 pcClient.addRemoteIceCandidate(candidate); 143 pcClient.addRemoteIceCandidate(candidate);
144 } 144 }
145 }); 145 });
146 } 146 }
147 iceCandidates.add(candidate); 147 iceCandidates.add(candidate);
148 iceCandidateEvent.notifyAll(); 148 iceCandidateEvent.notifyAll();
149 } 149 }
150 } 150 }
151 151
152 @Override 152 @Override
153 public void onIceCandidatesRemoved(final IceCandidate[] candidates) {
154 // TODO(honghaiz): Add this for tests.
155 }
156
157 @Override
158 public void onIceConnected() { 153 public void onIceConnected() {
159 Log.d(TAG, "ICE Connected"); 154 Log.d(TAG, "ICE Connected");
160 synchronized(iceConnectedEvent) { 155 synchronized(iceConnectedEvent) {
161 isIceConnected = true; 156 isIceConnected = true;
162 iceConnectedEvent.notifyAll(); 157 iceConnectedEvent.notifyAll();
163 } 158 }
164 } 159 }
165 160
166 @Override 161 @Override
167 public void onIceDisconnected() { 162 public void onIceDisconnected() {
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 assertTrue("Remote video frames were not rendered after capture format cha nge.", 603 assertTrue("Remote video frames were not rendered after capture format cha nge.",
609 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT)); 604 remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT));
610 } 605 }
611 606
612 pcClient.close(); 607 pcClient.close();
613 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT)); 608 assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT));
614 Log.d(TAG, "testCaptureFormatChange done."); 609 Log.d(TAG, "testCaptureFormatChange done.");
615 } 610 }
616 611
617 } 612 }
OLDNEW
« no previous file with comments | « webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java ('k') | webrtc/p2p/base/candidate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698