| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 public static final String EXTRA_HWCODEC_ENABLED = | 67 public static final String EXTRA_HWCODEC_ENABLED = |
| 68 "org.appspot.apprtc.HWCODEC"; | 68 "org.appspot.apprtc.HWCODEC"; |
| 69 public static final String EXTRA_CAPTURETOTEXTURE_ENABLED = | 69 public static final String EXTRA_CAPTURETOTEXTURE_ENABLED = |
| 70 "org.appspot.apprtc.CAPTURETOTEXTURE"; | 70 "org.appspot.apprtc.CAPTURETOTEXTURE"; |
| 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 = |
| 78 "org.appspot.apprtc.AECDUMP"; |
| 77 public static final String EXTRA_OPENSLES_ENABLED = | 79 public static final String EXTRA_OPENSLES_ENABLED = |
| 78 "org.appspot.apprtc.OPENSLES"; | 80 "org.appspot.apprtc.OPENSLES"; |
| 79 public static final String EXTRA_DISPLAY_HUD = | 81 public static final String EXTRA_DISPLAY_HUD = |
| 80 "org.appspot.apprtc.DISPLAY_HUD"; | 82 "org.appspot.apprtc.DISPLAY_HUD"; |
| 81 public static final String EXTRA_CMDLINE = | 83 public static final String EXTRA_CMDLINE = |
| 82 "org.appspot.apprtc.CMDLINE"; | 84 "org.appspot.apprtc.CMDLINE"; |
| 83 public static final String EXTRA_RUNTIME = | 85 public static final String EXTRA_RUNTIME = |
| 84 "org.appspot.apprtc.RUNTIME"; | 86 "org.appspot.apprtc.RUNTIME"; |
| 85 private static final String TAG = "CallRTCClient"; | 87 private static final String TAG = "CallRTCClient"; |
| 86 | 88 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), | 221 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), |
| 220 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), | 222 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), |
| 221 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), | 223 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), |
| 222 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), | 224 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), |
| 223 intent.getStringExtra(EXTRA_VIDEOCODEC), | 225 intent.getStringExtra(EXTRA_VIDEOCODEC), |
| 224 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), | 226 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), |
| 225 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), | 227 intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), |
| 226 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), | 228 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), |
| 227 intent.getStringExtra(EXTRA_AUDIOCODEC), | 229 intent.getStringExtra(EXTRA_AUDIOCODEC), |
| 228 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), | 230 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), |
| 231 intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), |
| 229 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false)); | 232 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false)); |
| 230 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); | 233 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); |
| 231 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); | 234 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); |
| 232 | 235 |
| 233 // Create connection client and connection parameters. | 236 // Create connection client and connection parameters. |
| 234 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); | 237 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); |
| 235 roomConnectionParameters = new RoomConnectionParameters( | 238 roomConnectionParameters = new RoomConnectionParameters( |
| 236 roomUri.toString(), roomId, loopback); | 239 roomUri.toString(), roomId, loopback); |
| 237 | 240 |
| 238 // Send intent arguments to fragments. | 241 // Send intent arguments to fragments. |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 } | 646 } |
| 644 } | 647 } |
| 645 }); | 648 }); |
| 646 } | 649 } |
| 647 | 650 |
| 648 @Override | 651 @Override |
| 649 public void onPeerConnectionError(final String description) { | 652 public void onPeerConnectionError(final String description) { |
| 650 reportError(description); | 653 reportError(description); |
| 651 } | 654 } |
| 652 } | 655 } |
| OLD | NEW |