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

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

Issue 1720283002: Add more camera resolutions to camera scaling slider. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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 14 matching lines...) Expand all
25 import android.os.Bundle; 25 import android.os.Bundle;
26 import android.os.Handler; 26 import android.os.Handler;
27 import android.util.Log; 27 import android.util.Log;
28 import android.view.View; 28 import android.view.View;
29 import android.view.Window; 29 import android.view.Window;
30 import android.view.WindowManager.LayoutParams; 30 import android.view.WindowManager.LayoutParams;
31 import android.widget.Toast; 31 import android.widget.Toast;
32 32
33 import org.webrtc.EglBase; 33 import org.webrtc.EglBase;
34 import org.webrtc.IceCandidate; 34 import org.webrtc.IceCandidate;
35 import org.webrtc.PeerConnectionFactory;
35 import org.webrtc.SessionDescription; 36 import org.webrtc.SessionDescription;
36 import org.webrtc.StatsReport; 37 import org.webrtc.StatsReport;
37 import org.webrtc.RendererCommon.ScalingType; 38 import org.webrtc.RendererCommon.ScalingType;
38 import org.webrtc.SurfaceViewRenderer; 39 import org.webrtc.SurfaceViewRenderer;
39 40
40 /** 41 /**
41 * Activity for peer connection call setup, call waiting 42 * Activity for peer connection call setup, call waiting
42 * and call view. 43 * and call view.
43 */ 44 */
44 public class CallActivity extends Activity 45 public class CallActivity extends Activity
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 if (commandLineRun && runTimeMs > 0) { 256 if (commandLineRun && runTimeMs > 0) {
256 (new Handler()).postDelayed(new Runnable() { 257 (new Handler()).postDelayed(new Runnable() {
257 @Override 258 @Override
258 public void run() { 259 public void run() {
259 disconnect(); 260 disconnect();
260 } 261 }
261 }, runTimeMs); 262 }, runTimeMs);
262 } 263 }
263 264
264 peerConnectionClient = PeerConnectionClient.getInstance(); 265 peerConnectionClient = PeerConnectionClient.getInstance();
266 if (loopback) {
267 PeerConnectionFactory.Options options = new PeerConnectionFactory.Options( );
268 options.networkIgnoreMask = 0;
269 peerConnectionClient.setPeerConnectionFactoryOptions(options);
270 }
265 peerConnectionClient.createPeerConnectionFactory( 271 peerConnectionClient.createPeerConnectionFactory(
266 CallActivity.this, peerConnectionParameters, CallActivity.this); 272 CallActivity.this, peerConnectionParameters, CallActivity.this);
267 } 273 }
268 274
269 // Activity interfaces 275 // Activity interfaces
270 @Override 276 @Override
271 public void onPause() { 277 public void onPause() {
272 super.onPause(); 278 super.onPause();
273 activityRunning = false; 279 activityRunning = false;
274 if (peerConnectionClient != null) { 280 if (peerConnectionClient != null) {
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 } 656 }
651 } 657 }
652 }); 658 });
653 } 659 }
654 660
655 @Override 661 @Override
656 public void onPeerConnectionError(final String description) { 662 public void onPeerConnectionError(final String description) {
657 reportError(description); 663 reportError(description);
658 } 664 }
659 } 665 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698