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

Side by Side Diff: talk/examples/android/src/org/appspot/apprtc/CallActivity.java

Issue 1168313003: Revert "Landing https://webrtc-codereview.appspot.com/53669004/" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 public static final String EXTRA_VIDEO_BITRATE = 78 public static final String EXTRA_VIDEO_BITRATE =
79 "org.appspot.apprtc.VIDEO_BITRATE"; 79 "org.appspot.apprtc.VIDEO_BITRATE";
80 public static final String EXTRA_VIDEOCODEC = 80 public static final String EXTRA_VIDEOCODEC =
81 "org.appspot.apprtc.VIDEOCODEC"; 81 "org.appspot.apprtc.VIDEOCODEC";
82 public static final String EXTRA_HWCODEC_ENABLED = 82 public static final String EXTRA_HWCODEC_ENABLED =
83 "org.appspot.apprtc.HWCODEC"; 83 "org.appspot.apprtc.HWCODEC";
84 public static final String EXTRA_AUDIO_BITRATE = 84 public static final String EXTRA_AUDIO_BITRATE =
85 "org.appspot.apprtc.AUDIO_BITRATE"; 85 "org.appspot.apprtc.AUDIO_BITRATE";
86 public static final String EXTRA_AUDIOCODEC = 86 public static final String EXTRA_AUDIOCODEC =
87 "org.appspot.apprtc.AUDIOCODEC"; 87 "org.appspot.apprtc.AUDIOCODEC";
88 public static final String EXTRA_NOAUDIOPROCESSING_ENABLED =
89 "org.appspot.apprtc.NOAUDIOPROCESSING";
90 public static final String EXTRA_CPUOVERUSE_DETECTION = 88 public static final String EXTRA_CPUOVERUSE_DETECTION =
91 "org.appspot.apprtc.CPUOVERUSE_DETECTION"; 89 "org.appspot.apprtc.CPUOVERUSE_DETECTION";
92 public static final String EXTRA_DISPLAY_HUD = 90 public static final String EXTRA_DISPLAY_HUD =
93 "org.appspot.apprtc.DISPLAY_HUD"; 91 "org.appspot.apprtc.DISPLAY_HUD";
94 public static final String EXTRA_CMDLINE = 92 public static final String EXTRA_CMDLINE =
95 "org.appspot.apprtc.CMDLINE"; 93 "org.appspot.apprtc.CMDLINE";
96 public static final String EXTRA_RUNTIME = 94 public static final String EXTRA_RUNTIME =
97 "org.appspot.apprtc.RUNTIME"; 95 "org.appspot.apprtc.RUNTIME";
98 private static final String TAG = "CallRTCClient"; 96 private static final String TAG = "CallRTCClient";
99 97
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 intent.getBooleanExtra(EXTRA_VIDEO_CALL, true), 228 intent.getBooleanExtra(EXTRA_VIDEO_CALL, true),
231 loopback, 229 loopback,
232 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), 230 intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0),
233 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), 231 intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0),
234 intent.getIntExtra(EXTRA_VIDEO_FPS, 0), 232 intent.getIntExtra(EXTRA_VIDEO_FPS, 0),
235 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), 233 intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0),
236 intent.getStringExtra(EXTRA_VIDEOCODEC), 234 intent.getStringExtra(EXTRA_VIDEOCODEC),
237 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), 235 intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true),
238 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), 236 intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0),
239 intent.getStringExtra(EXTRA_AUDIOCODEC), 237 intent.getStringExtra(EXTRA_AUDIOCODEC),
240 intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false),
241 intent.getBooleanExtra(EXTRA_CPUOVERUSE_DETECTION, true)); 238 intent.getBooleanExtra(EXTRA_CPUOVERUSE_DETECTION, true));
242 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); 239 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false);
243 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); 240 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0);
244 241
245 // Create connection client and connection parameters. 242 // Create connection client and connection parameters.
246 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); 243 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor());
247 roomConnectionParameters = new RoomConnectionParameters( 244 roomConnectionParameters = new RoomConnectionParameters(
248 roomUri.toString(), roomId, loopback); 245 roomUri.toString(), roomId, loopback);
249 246
250 // Send intent arguments to fragments. 247 // Send intent arguments to fragments.
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 } 652 }
656 } 653 }
657 }); 654 });
658 } 655 }
659 656
660 @Override 657 @Override
661 public void onPeerConnectionError(final String description) { 658 public void onPeerConnectionError(final String description) {
662 reportError(description); 659 reportError(description);
663 } 660 }
664 } 661 }
OLDNEW
« no previous file with comments | « talk/examples/android/res/xml/preferences.xml ('k') | talk/examples/android/src/org/appspot/apprtc/ConnectActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698