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

Side by Side Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

Issue 2193753002: Add an option to enable level control to Android AppRTC Demo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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 * Copyright 2014 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2014 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 private String keyprefAudioBitrateValue; 66 private String keyprefAudioBitrateValue;
67 private String keyprefAudioCodec; 67 private String keyprefAudioCodec;
68 private String keyprefHwCodecAcceleration; 68 private String keyprefHwCodecAcceleration;
69 private String keyprefCaptureToTexture; 69 private String keyprefCaptureToTexture;
70 private String keyprefNoAudioProcessingPipeline; 70 private String keyprefNoAudioProcessingPipeline;
71 private String keyprefAecDump; 71 private String keyprefAecDump;
72 private String keyprefOpenSLES; 72 private String keyprefOpenSLES;
73 private String keyprefDisableBuiltInAec; 73 private String keyprefDisableBuiltInAec;
74 private String keyprefDisableBuiltInAgc; 74 private String keyprefDisableBuiltInAgc;
75 private String keyprefDisableBuiltInNs; 75 private String keyprefDisableBuiltInNs;
76 private String keyprefEnableLevelControl;
76 private String keyprefDisplayHud; 77 private String keyprefDisplayHud;
77 private String keyprefTracing; 78 private String keyprefTracing;
78 private String keyprefRoomServerUrl; 79 private String keyprefRoomServerUrl;
79 private String keyprefRoom; 80 private String keyprefRoom;
80 private String keyprefRoomList; 81 private String keyprefRoomList;
81 private ArrayList<String> roomList; 82 private ArrayList<String> roomList;
82 private ArrayAdapter<String> adapter; 83 private ArrayAdapter<String> adapter;
83 84
84 @Override 85 @Override
85 public void onCreate(Bundle savedInstanceState) { 86 public void onCreate(Bundle savedInstanceState) {
(...skipping 14 matching lines...) Expand all
100 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key); 101 keyprefCaptureToTexture = getString(R.string.pref_capturetotexture_key);
101 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key); 102 keyprefAudioBitrateType = getString(R.string.pref_startaudiobitrate_key);
102 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y); 103 keyprefAudioBitrateValue = getString(R.string.pref_startaudiobitratevalue_ke y);
103 keyprefAudioCodec = getString(R.string.pref_audiocodec_key); 104 keyprefAudioCodec = getString(R.string.pref_audiocodec_key);
104 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing _key); 105 keyprefNoAudioProcessingPipeline = getString(R.string.pref_noaudioprocessing _key);
105 keyprefAecDump = getString(R.string.pref_aecdump_key); 106 keyprefAecDump = getString(R.string.pref_aecdump_key);
106 keyprefOpenSLES = getString(R.string.pref_opensles_key); 107 keyprefOpenSLES = getString(R.string.pref_opensles_key);
107 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key) ; 108 keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key) ;
108 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key) ; 109 keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key) ;
109 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key); 110 keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key);
111 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key );
110 keyprefDisplayHud = getString(R.string.pref_displayhud_key); 112 keyprefDisplayHud = getString(R.string.pref_displayhud_key);
111 keyprefTracing = getString(R.string.pref_tracing_key); 113 keyprefTracing = getString(R.string.pref_tracing_key);
112 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); 114 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key);
113 keyprefRoom = getString(R.string.pref_room_key); 115 keyprefRoom = getString(R.string.pref_room_key);
114 keyprefRoomList = getString(R.string.pref_room_list_key); 116 keyprefRoomList = getString(R.string.pref_room_list_key);
115 117
116 setContentView(R.layout.activity_connect); 118 setContentView(R.layout.activity_connect);
117 119
118 roomEditText = (EditText) findViewById(R.id.room_edittext); 120 roomEditText = (EditText) findViewById(R.id.room_edittext);
119 roomEditText.setOnEditorActionListener( 121 roomEditText.setOnEditorActionListener(
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // Check Disable built-in AGC flag. 308 // Check Disable built-in AGC flag.
307 boolean disableBuiltInAGC = sharedPref.getBoolean( 309 boolean disableBuiltInAGC = sharedPref.getBoolean(
308 keyprefDisableBuiltInAgc, 310 keyprefDisableBuiltInAgc,
309 Boolean.valueOf(getString(R.string.pref_disable_built_in_agc_default))); 311 Boolean.valueOf(getString(R.string.pref_disable_built_in_agc_default)));
310 312
311 // Check Disable built-in NS flag. 313 // Check Disable built-in NS flag.
312 boolean disableBuiltInNS = sharedPref.getBoolean( 314 boolean disableBuiltInNS = sharedPref.getBoolean(
313 keyprefDisableBuiltInNs, 315 keyprefDisableBuiltInNs,
314 Boolean.valueOf(getString(R.string.pref_disable_built_in_ns_default))); 316 Boolean.valueOf(getString(R.string.pref_disable_built_in_ns_default)));
315 317
318 // Check Enable level control.
319 boolean enableLevelControl = sharedPref.getBoolean(
320 keyprefEnableLevelControl,
321 Boolean.valueOf(getString(R.string.pref_enable_level_control_key)));
322
316 // Get video resolution from settings. 323 // Get video resolution from settings.
317 int videoWidth = 0; 324 int videoWidth = 0;
318 int videoHeight = 0; 325 int videoHeight = 0;
319 String resolution = sharedPref.getString(keyprefResolution, 326 String resolution = sharedPref.getString(keyprefResolution,
320 getString(R.string.pref_resolution_default)); 327 getString(R.string.pref_resolution_default));
321 String[] dimensions = resolution.split("[ x]+"); 328 String[] dimensions = resolution.split("[ x]+");
322 if (dimensions.length == 2) { 329 if (dimensions.length == 2) {
323 try { 330 try {
324 videoWidth = Integer.parseInt(dimensions[0]); 331 videoWidth = Integer.parseInt(dimensions[0]);
325 videoHeight = Integer.parseInt(dimensions[1]); 332 videoHeight = Integer.parseInt(dimensions[1]);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); 401 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec);
395 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); 402 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec);
396 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText ure); 403 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText ure);
397 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, 404 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED,
398 noAudioProcessing); 405 noAudioProcessing);
399 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); 406 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump);
400 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); 407 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES);
401 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC ); 408 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC );
402 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC ); 409 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC );
403 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); 410 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS);
411 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro l);
404 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); 412 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate);
405 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); 413 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec);
406 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); 414 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud);
407 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); 415 intent.putExtra(CallActivity.EXTRA_TRACING, tracing);
408 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); 416 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun);
409 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); 417 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs);
410 418
411 startActivityForResult(intent, CONNECTION_REQUEST); 419 startActivityForResult(intent, CONNECTION_REQUEST);
412 } 420 }
413 } 421 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 457 }
450 }; 458 };
451 459
452 private final OnClickListener connectListener = new OnClickListener() { 460 private final OnClickListener connectListener = new OnClickListener() {
453 @Override 461 @Override
454 public void onClick(View view) { 462 public void onClick(View view) {
455 connectToRoom(roomEditText.getText().toString(), false, false, 0); 463 connectToRoom(roomEditText.getText().toString(), false, false, 0);
456 } 464 }
457 }; 465 };
458 } 466 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698