| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 public static final String EXTRA_AUDIO_BITRATE = "org.appspot.apprtc.AUDIO_BIT
RATE"; | 99 public static final String EXTRA_AUDIO_BITRATE = "org.appspot.apprtc.AUDIO_BIT
RATE"; |
| 100 public static final String EXTRA_AUDIOCODEC = "org.appspot.apprtc.AUDIOCODEC"; | 100 public static final String EXTRA_AUDIOCODEC = "org.appspot.apprtc.AUDIOCODEC"; |
| 101 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = | 101 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = |
| 102 "org.appspot.apprtc.NOAUDIOPROCESSING"; | 102 "org.appspot.apprtc.NOAUDIOPROCESSING"; |
| 103 public static final String EXTRA_AECDUMP_ENABLED = "org.appspot.apprtc.AECDUMP
"; | 103 public static final String EXTRA_AECDUMP_ENABLED = "org.appspot.apprtc.AECDUMP
"; |
| 104 public static final String EXTRA_OPENSLES_ENABLED = "org.appspot.apprtc.OPENSL
ES"; | 104 public static final String EXTRA_OPENSLES_ENABLED = "org.appspot.apprtc.OPENSL
ES"; |
| 105 public static final String EXTRA_DISABLE_BUILT_IN_AEC = "org.appspot.apprtc.DI
SABLE_BUILT_IN_AEC"; | 105 public static final String EXTRA_DISABLE_BUILT_IN_AEC = "org.appspot.apprtc.DI
SABLE_BUILT_IN_AEC"; |
| 106 public static final String EXTRA_DISABLE_BUILT_IN_AGC = "org.appspot.apprtc.DI
SABLE_BUILT_IN_AGC"; | 106 public static final String EXTRA_DISABLE_BUILT_IN_AGC = "org.appspot.apprtc.DI
SABLE_BUILT_IN_AGC"; |
| 107 public static final String EXTRA_DISABLE_BUILT_IN_NS = "org.appspot.apprtc.DIS
ABLE_BUILT_IN_NS"; | 107 public static final String EXTRA_DISABLE_BUILT_IN_NS = "org.appspot.apprtc.DIS
ABLE_BUILT_IN_NS"; |
| 108 public static final String EXTRA_ENABLE_LEVEL_CONTROL = "org.appspot.apprtc.EN
ABLE_LEVEL_CONTROL"; | 108 public static final String EXTRA_ENABLE_LEVEL_CONTROL = "org.appspot.apprtc.EN
ABLE_LEVEL_CONTROL"; |
| 109 public static final String EXTRA_DISABLE_WEBRTC_AGC_AND_HPF = |
| 110 "org.appspot.apprtc.DISABLE_WEBRTC_GAIN_CONTROL"; |
| 109 public static final String EXTRA_DISPLAY_HUD = "org.appspot.apprtc.DISPLAY_HUD
"; | 111 public static final String EXTRA_DISPLAY_HUD = "org.appspot.apprtc.DISPLAY_HUD
"; |
| 110 public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; | 112 public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; |
| 111 public static final String EXTRA_CMDLINE = "org.appspot.apprtc.CMDLINE"; | 113 public static final String EXTRA_CMDLINE = "org.appspot.apprtc.CMDLINE"; |
| 112 public static final String EXTRA_RUNTIME = "org.appspot.apprtc.RUNTIME"; | 114 public static final String EXTRA_RUNTIME = "org.appspot.apprtc.RUNTIME"; |
| 113 public static final String EXTRA_VIDEO_FILE_AS_CAMERA = "org.appspot.apprtc.VI
DEO_FILE_AS_CAMERA"; | 115 public static final String EXTRA_VIDEO_FILE_AS_CAMERA = "org.appspot.apprtc.VI
DEO_FILE_AS_CAMERA"; |
| 114 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE = | 116 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE = |
| 115 "org.appspot.apprtc.SAVE_REMOTE_VIDEO_TO_FILE"; | 117 "org.appspot.apprtc.SAVE_REMOTE_VIDEO_TO_FILE"; |
| 116 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_WIDTH = | 118 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_WIDTH = |
| 117 "org.appspot.apprtc.SAVE_REMOTE_VIDEO_TO_FILE_WIDTH"; | 119 "org.appspot.apprtc.SAVE_REMOTE_VIDEO_TO_FILE_WIDTH"; |
| 118 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_HEIGHT = | 120 public static final String EXTRA_SAVE_REMOTE_VIDEO_TO_FILE_HEIGHT = |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), intent.getStringExtra(EX
TRA_VIDEOCODEC), | 318 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), intent.getStringExtra(EX
TRA_VIDEOCODEC), |
| 317 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), | 319 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), |
| 318 intent.getBooleanExtra(EXTRA_FLEXFEC_ENABLED, false), | 320 intent.getBooleanExtra(EXTRA_FLEXFEC_ENABLED, false), |
| 319 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), intent.getStringExtra(EX
TRA_AUDIOCODEC), | 321 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), intent.getStringExtra(EX
TRA_AUDIOCODEC), |
| 320 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), | 322 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), |
| 321 intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), | 323 intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), |
| 322 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false), | 324 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false), |
| 323 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AEC, false), | 325 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AEC, false), |
| 324 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AGC, false), | 326 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AGC, false), |
| 325 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_NS, false), | 327 intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_NS, false), |
| 326 intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false), dataChann
elParameters); | 328 intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false), |
| 329 intent.getBooleanExtra(EXTRA_DISABLE_WEBRTC_AGC_AND_HPF, false), dat
aChannelParameters); |
| 327 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); | 330 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); |
| 328 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); | 331 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); |
| 329 | 332 |
| 330 Log.d(TAG, "VIDEO_FILE: '" + intent.getStringExtra(EXTRA_VIDEO_FILE_AS_CAMER
A) + "'"); | 333 Log.d(TAG, "VIDEO_FILE: '" + intent.getStringExtra(EXTRA_VIDEO_FILE_AS_CAMER
A) + "'"); |
| 331 | 334 |
| 332 // Create connection client. Use DirectRTCClient if room name is an IP other
wise use the | 335 // Create connection client. Use DirectRTCClient if room name is an IP other
wise use the |
| 333 // standard WebSocketRTCClient. | 336 // standard WebSocketRTCClient. |
| 334 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) { | 337 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) { |
| 335 appRtcClient = new WebSocketRTCClient(this); | 338 appRtcClient = new WebSocketRTCClient(this); |
| 336 } else { | 339 } else { |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 } | 936 } |
| 934 } | 937 } |
| 935 }); | 938 }); |
| 936 } | 939 } |
| 937 | 940 |
| 938 @Override | 941 @Override |
| 939 public void onPeerConnectionError(final String description) { | 942 public void onPeerConnectionError(final String description) { |
| 940 reportError(description); | 943 reportError(description); |
| 941 } | 944 } |
| 942 } | 945 } |
| OLD | NEW |