OLD | NEW |
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 public static final String EXTRA_AUDIO_BITRATE = | 71 public static final String EXTRA_AUDIO_BITRATE = |
72 "org.appspot.apprtc.AUDIO_BITRATE"; | 72 "org.appspot.apprtc.AUDIO_BITRATE"; |
73 public static final String EXTRA_AUDIOCODEC = | 73 public static final String EXTRA_AUDIOCODEC = |
74 "org.appspot.apprtc.AUDIOCODEC"; | 74 "org.appspot.apprtc.AUDIOCODEC"; |
75 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = | 75 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = |
76 "org.appspot.apprtc.NOAUDIOPROCESSING"; | 76 "org.appspot.apprtc.NOAUDIOPROCESSING"; |
77 public static final String EXTRA_AECDUMP_ENABLED = | 77 public static final String EXTRA_AECDUMP_ENABLED = |
78 "org.appspot.apprtc.AECDUMP"; | 78 "org.appspot.apprtc.AECDUMP"; |
79 public static final String EXTRA_OPENSLES_ENABLED = | 79 public static final String EXTRA_OPENSLES_ENABLED = |
80 "org.appspot.apprtc.OPENSLES"; | 80 "org.appspot.apprtc.OPENSLES"; |
| 81 public static final String EXTRA_DISABLE_BUILT_IN_AEC = |
| 82 "org.appspot.apprtc.DISABLE_BUILT_IN_AEC"; |
81 public static final String EXTRA_DISPLAY_HUD = | 83 public static final String EXTRA_DISPLAY_HUD = |
82 "org.appspot.apprtc.DISPLAY_HUD"; | 84 "org.appspot.apprtc.DISPLAY_HUD"; |
83 public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; | 85 public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; |
84 public static final String EXTRA_CMDLINE = | 86 public static final String EXTRA_CMDLINE = |
85 "org.appspot.apprtc.CMDLINE"; | 87 "org.appspot.apprtc.CMDLINE"; |
86 public static final String EXTRA_RUNTIME = | 88 public static final String EXTRA_RUNTIME = |
87 "org.appspot.apprtc.RUNTIME"; | 89 "org.appspot.apprtc.RUNTIME"; |
88 private static final String TAG = "CallRTCClient"; | 90 private static final String TAG = "CallRTCClient"; |
89 | 91 |
90 // List of mandatory application permissions. | 92 // List of mandatory application permissions. |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), | 229 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), |
228 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), | 230 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), |
229 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), | 231 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), |
230 intent.getStringExtra(EXTRA_VIDEOCODEC), | 232 intent.getStringExtra(EXTRA_VIDEOCODEC), |
231 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), | 233 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), |
232 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), | 234 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), |
233 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), | 235 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), |
234 intent.getStringExtra(EXTRA_AUDIOCODEC), | 236 intent.getStringExtra(EXTRA_AUDIOCODEC), |
235 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), | 237 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), |
236 intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), | 238 intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), |
237 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false)); | 239 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false), |
| 240 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AEC, false)); |
238 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); | 241 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); |
239 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); | 242 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); |
240 | 243 |
241 // Create connection client. Use DirectRTCClient if room name is an IP other
wise use the | 244 // Create connection client. Use DirectRTCClient if room name is an IP other
wise use the |
242 // standard WebSocketRTCClient. | 245 // standard WebSocketRTCClient. |
243 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) { | 246 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) { |
244 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); | 247 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); |
245 } else { | 248 } else { |
246 Log.i(TAG, "Using DirectRTCClient because room name looks like an IP."); | 249 Log.i(TAG, "Using DirectRTCClient because room name looks like an IP."); |
247 appRtcClient = new DirectRTCClient(this); | 250 appRtcClient = new DirectRTCClient(this); |
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
704 } | 707 } |
705 } | 708 } |
706 }); | 709 }); |
707 } | 710 } |
708 | 711 |
709 @Override | 712 @Override |
710 public void onPeerConnectionError(final String description) { | 713 public void onPeerConnectionError(final String description) { |
711 reportError(description); | 714 reportError(description); |
712 } | 715 } |
713 } | 716 } |
OLD | NEW |