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

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

Issue 1449083002: Add OpenSL ES enable setting to AppRTCDemo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix typo Created 5 years, 1 month 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 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 public static final String EXTRA_VIDEOCODEC = 66 public static final String EXTRA_VIDEOCODEC =
67 "org.appspot.apprtc.VIDEOCODEC"; 67 "org.appspot.apprtc.VIDEOCODEC";
68 public static final String EXTRA_HWCODEC_ENABLED = 68 public static final String EXTRA_HWCODEC_ENABLED =
69 "org.appspot.apprtc.HWCODEC"; 69 "org.appspot.apprtc.HWCODEC";
70 public static final String EXTRA_AUDIO_BITRATE = 70 public static final String EXTRA_AUDIO_BITRATE =
71 "org.appspot.apprtc.AUDIO_BITRATE"; 71 "org.appspot.apprtc.AUDIO_BITRATE";
72 public static final String EXTRA_AUDIOCODEC = 72 public static final String EXTRA_AUDIOCODEC =
73 "org.appspot.apprtc.AUDIOCODEC"; 73 "org.appspot.apprtc.AUDIOCODEC";
74 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = 74 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED =
75 "org.appspot.apprtc.NOAUDIOPROCESSING"; 75 "org.appspot.apprtc.NOAUDIOPROCESSING";
76 public static final String EXTRA_CPUOVERUSE_DETECTION = 76 public static final String EXTRA_OPENSLES_ENABLED =
77 "org.appspot.apprtc.CPUOVERUSE_DETECTION"; 77 "org.appspot.apprtc.OPENSLES";
78 public static final String EXTRA_DISPLAY_HUD = 78 public static final String EXTRA_DISPLAY_HUD =
79 "org.appspot.apprtc.DISPLAY_HUD"; 79 "org.appspot.apprtc.DISPLAY_HUD";
80 public static final String EXTRA_CMDLINE = 80 public static final String EXTRA_CMDLINE =
81 "org.appspot.apprtc.CMDLINE"; 81 "org.appspot.apprtc.CMDLINE";
82 public static final String EXTRA_RUNTIME = 82 public static final String EXTRA_RUNTIME =
83 "org.appspot.apprtc.RUNTIME"; 83 "org.appspot.apprtc.RUNTIME";
84 private static final String TAG = "CallRTCClient"; 84 private static final String TAG = "CallRTCClient";
85 85
86 // List of mandatory application permissions. 86 // List of mandatory application permissions.
87 private static final String[] MANDATORY_PERMISSIONS = { 87 private static final String[] MANDATORY_PERMISSIONS = {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 loopback, 217 loopback,
218 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), 218 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0),
219 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), 219 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0),
220 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), 220 intent.getIntExtra(EXTRA_VIDEO_FPS, 0),
221 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), 221 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0),
222 intent.getStringExtra(EXTRA_VIDEOCODEC), 222 intent.getStringExtra(EXTRA_VIDEOCODEC),
223 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), 223 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true),
224 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), 224 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0),
225 intent.getStringExtra(EXTRA_AUDIOCODEC), 225 intent.getStringExtra(EXTRA_AUDIOCODEC),
226 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), 226 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false),
227 intent.getBooleanExtra(EXTRA_CPUOVERUSE_DETECTION, true)); 227 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false));
228 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); 228 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false);
229 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); 229 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0);
230 230
231 // Create connection client and connection parameters. 231 // Create connection client and connection parameters.
232 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); 232 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor());
233 roomConnectionParameters = new RoomConnectionParameters( 233 roomConnectionParameters = new RoomConnectionParameters(
234 roomUri.toString(), roomId, loopback); 234 roomUri.toString(), roomId, loopback);
235 235
236 // Send intent arguments to fragments. 236 // Send intent arguments to fragments.
237 callFragment.setArguments(intent.getExtras()); 237 callFragment.setArguments(intent.getExtras());
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 } 641 }
642 } 642 }
643 }); 643 });
644 } 644 }
645 645
646 @Override 646 @Override
647 public void onPeerConnectionError(final String description) { 647 public void onPeerConnectionError(final String description) {
648 reportError(description); 648 reportError(description);
649 } 649 }
650 } 650 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698