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

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

Issue 1449083002: Add OpenSL ES enable setting to AppRTCDemo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix typo Created 5 years, 1 month 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 17 matching lines...) Expand all
28 private String keyprefCaptureQualitySlider; 28 private String keyprefCaptureQualitySlider;
29 private String keyprefStartVideoBitrateType; 29 private String keyprefStartVideoBitrateType;
30 private String keyprefStartVideoBitrateValue; 30 private String keyprefStartVideoBitrateValue;
31 private String keyPrefVideoCodec; 31 private String keyPrefVideoCodec;
32 private String keyprefHwCodec; 32 private String keyprefHwCodec;
33 33
34 private String keyprefStartAudioBitrateType; 34 private String keyprefStartAudioBitrateType;
35 private String keyprefStartAudioBitrateValue; 35 private String keyprefStartAudioBitrateValue;
36 private String keyPrefAudioCodec; 36 private String keyPrefAudioCodec;
37 private String keyprefNoAudioProcessing; 37 private String keyprefNoAudioProcessing;
38 private String keyprefOpenSLES;
38 39
39 private String keyprefCpuUsageDetection;
40 private String keyPrefRoomServerUrl; 40 private String keyPrefRoomServerUrl;
41 private String keyPrefDisplayHud; 41 private String keyPrefDisplayHud;
42 42
43 @Override 43 @Override
44 protected void onCreate(Bundle savedInstanceState) { 44 protected void onCreate(Bundle savedInstanceState) {
45 super.onCreate(savedInstanceState); 45 super.onCreate(savedInstanceState);
46 keyprefVideoCall = getString(R.string.pref_videocall_key); 46 keyprefVideoCall = getString(R.string.pref_videocall_key);
47 keyprefResolution = getString(R.string.pref_resolution_key); 47 keyprefResolution = getString(R.string.pref_resolution_key);
48 keyprefFps = getString(R.string.pref_fps_key); 48 keyprefFps = getString(R.string.pref_fps_key);
49 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey); 49 keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_k ey);
50 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key ); 50 keyprefStartVideoBitrateType = getString(R.string.pref_startvideobitrate_key );
51 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key); 51 keyprefStartVideoBitrateValue = getString(R.string.pref_startvideobitrateval ue_key);
52 keyPrefVideoCodec = getString(R.string.pref_videocodec_key); 52 keyPrefVideoCodec = getString(R.string.pref_videocodec_key);
53 keyprefHwCodec = getString(R.string.pref_hwcodec_key); 53 keyprefHwCodec = getString(R.string.pref_hwcodec_key);
54 54
55 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key ); 55 keyprefStartAudioBitrateType = getString(R.string.pref_startaudiobitrate_key );
56 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key); 56 keyprefStartAudioBitrateValue = getString(R.string.pref_startaudiobitrateval ue_key);
57 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key); 57 keyPrefAudioCodec = getString(R.string.pref_audiocodec_key);
58 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key); 58 keyprefNoAudioProcessing = getString(R.string.pref_noaudioprocessing_key);
59 keyprefOpenSLES = getString(R.string.pref_opensles_key);
59 60
60 keyprefCpuUsageDetection = getString(R.string.pref_cpu_usage_detection_key);
61 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key); 61 keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
62 keyPrefDisplayHud = getString(R.string.pref_displayhud_key); 62 keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
63 63
64 // Display the fragment as the main content. 64 // Display the fragment as the main content.
65 settingsFragment = new SettingsFragment(); 65 settingsFragment = new SettingsFragment();
66 getFragmentManager().beginTransaction() 66 getFragmentManager().beginTransaction()
67 .replace(android.R.id.content, settingsFragment) 67 .replace(android.R.id.content, settingsFragment)
68 .commit(); 68 .commit();
69 } 69 }
70 70
(...skipping 12 matching lines...) Expand all
83 updateSummaryBitrate(sharedPreferences, keyprefStartVideoBitrateValue); 83 updateSummaryBitrate(sharedPreferences, keyprefStartVideoBitrateValue);
84 setVideoBitrateEnable(sharedPreferences); 84 setVideoBitrateEnable(sharedPreferences);
85 updateSummary(sharedPreferences, keyPrefVideoCodec); 85 updateSummary(sharedPreferences, keyPrefVideoCodec);
86 updateSummaryB(sharedPreferences, keyprefHwCodec); 86 updateSummaryB(sharedPreferences, keyprefHwCodec);
87 87
88 updateSummary(sharedPreferences, keyprefStartAudioBitrateType); 88 updateSummary(sharedPreferences, keyprefStartAudioBitrateType);
89 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue); 89 updateSummaryBitrate(sharedPreferences, keyprefStartAudioBitrateValue);
90 setAudioBitrateEnable(sharedPreferences); 90 setAudioBitrateEnable(sharedPreferences);
91 updateSummary(sharedPreferences, keyPrefAudioCodec); 91 updateSummary(sharedPreferences, keyPrefAudioCodec);
92 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing); 92 updateSummaryB(sharedPreferences, keyprefNoAudioProcessing);
93 updateSummaryB(sharedPreferences, keyprefOpenSLES);
93 94
94 updateSummaryB(sharedPreferences, keyprefCpuUsageDetection);
95 updateSummary(sharedPreferences, keyPrefRoomServerUrl); 95 updateSummary(sharedPreferences, keyPrefRoomServerUrl);
96 updateSummaryB(sharedPreferences, keyPrefDisplayHud); 96 updateSummaryB(sharedPreferences, keyPrefDisplayHud);
97 } 97 }
98 98
99 @Override 99 @Override
100 protected void onPause() { 100 protected void onPause() {
101 super.onPause(); 101 super.onPause();
102 SharedPreferences sharedPreferences = 102 SharedPreferences sharedPreferences =
103 settingsFragment.getPreferenceScreen().getSharedPreferences(); 103 settingsFragment.getPreferenceScreen().getSharedPreferences();
104 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this); 104 sharedPreferences.unregisterOnSharedPreferenceChangeListener(this);
(...skipping 10 matching lines...) Expand all
115 || key.equals(keyPrefAudioCodec) 115 || key.equals(keyPrefAudioCodec)
116 || key.equals(keyPrefRoomServerUrl)) { 116 || key.equals(keyPrefRoomServerUrl)) {
117 updateSummary(sharedPreferences, key); 117 updateSummary(sharedPreferences, key);
118 } else if (key.equals(keyprefStartVideoBitrateValue) 118 } else if (key.equals(keyprefStartVideoBitrateValue)
119 || key.equals(keyprefStartAudioBitrateValue)) { 119 || key.equals(keyprefStartAudioBitrateValue)) {
120 updateSummaryBitrate(sharedPreferences, key); 120 updateSummaryBitrate(sharedPreferences, key);
121 } else if (key.equals(keyprefVideoCall) 121 } else if (key.equals(keyprefVideoCall)
122 || key.equals(keyprefCaptureQualitySlider) 122 || key.equals(keyprefCaptureQualitySlider)
123 || key.equals(keyprefHwCodec) 123 || key.equals(keyprefHwCodec)
124 || key.equals(keyprefNoAudioProcessing) 124 || key.equals(keyprefNoAudioProcessing)
125 || key.equals(keyprefCpuUsageDetection) 125 || key.equals(keyprefOpenSLES)
126 || key.equals(keyPrefDisplayHud)) { 126 || key.equals(keyPrefDisplayHud)) {
127 updateSummaryB(sharedPreferences, key); 127 updateSummaryB(sharedPreferences, key);
128 } 128 }
129 if (key.equals(keyprefStartVideoBitrateType)) { 129 if (key.equals(keyprefStartVideoBitrateType)) {
130 setVideoBitrateEnable(sharedPreferences); 130 setVideoBitrateEnable(sharedPreferences);
131 } 131 }
132 if (key.equals(keyprefStartAudioBitrateType)) { 132 if (key.equals(keyprefStartAudioBitrateType)) {
133 setAudioBitrateEnable(sharedPreferences); 133 setAudioBitrateEnable(sharedPreferences);
134 } 134 }
135 } 135 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t); 172 String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_defaul t);
173 String bitrateType = sharedPreferences.getString( 173 String bitrateType = sharedPreferences.getString(
174 keyprefStartAudioBitrateType, bitrateTypeDefault); 174 keyprefStartAudioBitrateType, bitrateTypeDefault);
175 if (bitrateType.equals(bitrateTypeDefault)) { 175 if (bitrateType.equals(bitrateTypeDefault)) {
176 bitratePreferenceValue.setEnabled(false); 176 bitratePreferenceValue.setEnabled(false);
177 } else { 177 } else {
178 bitratePreferenceValue.setEnabled(true); 178 bitratePreferenceValue.setEnabled(true);
179 } 179 }
180 } 180 }
181 } 181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698