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

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

Issue 1176023002: Relanding https://webrtc-codereview.appspot.com/56589004 (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 2014 Google Inc. 3 * Copyright 2014 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 private String keyprefVideoCallEnabled; 74 private String keyprefVideoCallEnabled;
75 private String keyprefResolution; 75 private String keyprefResolution;
76 private String keyprefFps; 76 private String keyprefFps;
77 private String keyprefVideoBitrateType; 77 private String keyprefVideoBitrateType;
78 private String keyprefVideoBitrateValue; 78 private String keyprefVideoBitrateValue;
79 private String keyprefVideoCodec; 79 private String keyprefVideoCodec;
80 private String keyprefAudioBitrateType; 80 private String keyprefAudioBitrateType;
81 private String keyprefAudioBitrateValue; 81 private String keyprefAudioBitrateValue;
82 private String keyprefAudioCodec; 82 private String keyprefAudioCodec;
83 private String keyprefHwCodecAcceleration; 83 private String keyprefHwCodecAcceleration;
84 private String keyprefNoAudioProcessingPipeline;
84 private String keyprefCpuUsageDetection; 85 private String keyprefCpuUsageDetection;
85 private String keyprefDisplayHud; 86 private String keyprefDisplayHud;
86 private String keyprefRoomServerUrl; 87 private String keyprefRoomServerUrl;
87 private String keyprefRoom; 88 private String keyprefRoom;
88 private String keyprefRoomList; 89 private String keyprefRoomList;
89 private ArrayList<String> roomList; 90 private ArrayList<String> roomList;
90 private ArrayAdapter<String> adapter; 91 private ArrayAdapter<String> adapter;
91 92
92 @Override 93 @Override
93 public void onCreate(Bundle savedInstanceState) { 94 public void onCreate(Bundle savedInstanceState) {
94 super.onCreate(savedInstanceState); 95 super.onCreate(savedInstanceState);
95 96
96 // Get setting keys. 97 // Get setting keys.
97 PreferenceManager.setDefaultValues(this, R.xml.preferences, false); 98 PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
98 sharedPref = PreferenceManager.getDefaultSharedPreferences(this); 99 sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
99 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key); 100 keyprefVideoCallEnabled = getString(R.string.pref_videocall_key);
100 keyprefResolution = getString(R.string.pref_resolution_key); 101 keyprefResolution = getString(R.string.pref_resolution_key);
101 keyprefFps = getString(R.string.pref_fps_key); 102 keyprefFps = getString(R.string.pref_fps_key);
102 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key); 103 keyprefVideoBitrateType = getString(R.string.pref_startvideobitrate_key);
103 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke y); 104 keyprefVideoBitrateValue = getString(R.string.pref_startvideobitratevalue_ke y);
104 keyprefVideoCodec = getString(R.string.pref_videocodec_key); 105 keyprefVideoCodec = getString(R.string.pref_videocodec_key);
105 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key); 106 keyprefHwCodecAcceleration = getString(R.string.pref_hwcodec_key);
106 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); 107 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key);
107 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y); 108 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y);
108 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); 109 keyprefAudioCodec = getString(R.string.pref_audiocodec_key);
110 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing _key);
109 keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key); 111 keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
110 keyprefDisplayHud = getString(R.string.pref_displayhud_key); 112 keyprefDisplayHud = getString(R.string.pref_displayhud_key);
111 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); 113 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key);
112 keyprefRoom = getString(R.string.pref_room_key); 114 keyprefRoom = getString(R.string.pref_room_key);
113 keyprefRoomList = getString(R.string.pref_room_list_key); 115 keyprefRoomList = getString(R.string.pref_room_list_key);
114 116
115 setContentView(R.layout.activity_connect); 117 setContentView(R.layout.activity_connect);
116 118
117 roomEditText = (EditText) findViewById(R.id.room_edittext); 119 roomEditText = (EditText) findViewById(R.id.room_edittext);
118 roomEditText.setOnEditorActionListener( 120 roomEditText.setOnEditorActionListener(
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // Get default codecs. 261 // Get default codecs.
260 String videoCodec = sharedPref.getString(keyprefVideoCodec, 262 String videoCodec = sharedPref.getString(keyprefVideoCodec,
261 getString(R.string.pref_videocodec_default)); 263 getString(R.string.pref_videocodec_default));
262 String audioCodec = sharedPref.getString(keyprefAudioCodec, 264 String audioCodec = sharedPref.getString(keyprefAudioCodec,
263 getString(R.string.pref_audiocodec_default)); 265 getString(R.string.pref_audiocodec_default));
264 266
265 // Check HW codec flag. 267 // Check HW codec flag.
266 boolean hwCodec = sharedPref.getBoolean(keyprefHwCodecAcceleration, 268 boolean hwCodec = sharedPref.getBoolean(keyprefHwCodecAcceleration,
267 Boolean.valueOf(getString(R.string.pref_hwcodec_default))); 269 Boolean.valueOf(getString(R.string.pref_hwcodec_default)));
268 270
271 // Check Disable Audio Processing flag.
272 boolean noAudioProcessing = sharedPref.getBoolean(
273 keyprefNoAudioProcessingPipeline,
274 Boolean.valueOf(getString(R.string.pref_noaudioprocessing_default)));
275
269 // Get video resolution from settings. 276 // Get video resolution from settings.
270 int videoWidth = 0; 277 int videoWidth = 0;
271 int videoHeight = 0; 278 int videoHeight = 0;
272 String resolution = sharedPref.getString(keyprefResolution, 279 String resolution = sharedPref.getString(keyprefResolution,
273 getString(R.string.pref_resolution_default)); 280 getString(R.string.pref_resolution_default));
274 String[] dimensions = resolution.split("[ x]+"); 281 String[] dimensions = resolution.split("[ x]+");
275 if (dimensions.length == 2) { 282 if (dimensions.length == 2) {
276 try { 283 try {
277 videoWidth = Integer.parseInt(dimensions[0]); 284 videoWidth = Integer.parseInt(dimensions[0]);
278 videoHeight = Integer.parseInt(dimensions[1]); 285 videoHeight = Integer.parseInt(dimensions[1]);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 intent.setData(uri); 342 intent.setData(uri);
336 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); 343 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId);
337 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); 344 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback);
338 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); 345 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled);
339 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); 346 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth);
340 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); 347 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight);
341 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); 348 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps);
342 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); 349 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate);
343 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); 350 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec);
344 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); 351 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec);
352 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED,
353 noAudioProcessing);
345 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); 354 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate);
346 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); 355 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec);
347 intent.putExtra(CallActivity.EXTRA_CPUOVERUSE_DETECTION, 356 intent.putExtra(CallActivity.EXTRA_CPUOVERUSE_DETECTION,
348 cpuOveruseDetection); 357 cpuOveruseDetection);
349 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); 358 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud);
350 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); 359 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun);
351 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); 360 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs);
352 361
353 startActivityForResult(intent, CONNECTION_REQUEST); 362 startActivityForResult(intent, CONNECTION_REQUEST);
354 } 363 }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 } 411 }
403 } 412 }
404 if (position != AdapterView.INVALID_POSITION) { 413 if (position != AdapterView.INVALID_POSITION) {
405 return adapter.getItem(position); 414 return adapter.getItem(position);
406 } else { 415 } else {
407 return null; 416 return null;
408 } 417 }
409 } 418 }
410 419
411 } 420 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698