Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get supported video sizes from linphonecore

Browse source
This commit is contained in:
Sylvain Berfini 2014-01-28 14:06:16 +01:00
parent 0707ce744d
commit 1d06570576
4 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/values/non_localizable_strings.xml
View file

@ -67,11 +67,6 @@
<string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
<string name="pref_video_enable_key">pref_video_enable_key</string>
<string name="pref_preferred_video_size_key">pref_preferred_video_size_key</string>
<string name="pref_preferred_video_size_hd_key">pref_preferred_video_size_hd_key</string>
<string name="pref_preferred_video_size_vga_key">pref_preferred_video_size_vga_key</string>
<string name="pref_preferred_video_size_cif_key">pref_preferred_video_size_cif_key</string>
<string name="pref_preferred_video_size_qvga_key">pref_preferred_video_size_qvga_key</string>
<string name="pref_preferred_video_size_qcif_key">pref_preferred_video_size_qcif_key</string>
<string name="pref_animation_enable_key">pref_animation_enable_key</string>
<string name="pref_escape_plus_key">pref_escape_plus_key</string>
<string name="pref_echo_cancellation_key">pref_echo_cancellation_key</string>

5
res/values/strings.xml
View file

@ -119,11 +119,6 @@
<string name="pref_video_codec_h264_title">H264</string>
<string name="pref_video_codecs_title">Codecs</string>
<string name="pref_preferred_video_size">Preferred video size</string>
<string name="pref_preferred_video_size_hd">HD</string>
<string name="pref_preferred_video_size_vga">VGA (640x480)</string>
<string name="pref_preferred_video_size_cif">CIF (352x288)</string>
<string name="pref_preferred_video_size_qvga">QVGA (320x240)</string>
<string name="pref_preferred_video_size_qcif">QCIF (176x144)</string>
<string name="menu_videocall_back_to_dialer_title">Display dialer</string>
<string name="menu_videocall_switch_camera_title">Front/Rear Camera</string>
<string name="menu_videocall_change_resolution_when_low_resolution">Try High resolution</string>

21
src/org/linphone/SettingsFragment.java
View file

@ -405,29 +405,16 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
private void initializePreferredVideoSizePreferences(ListPreference pref) {
List<CharSequence> entries = new ArrayList<CharSequence>();
List<CharSequence> values = new ArrayList<CharSequence>();
if (Version.isHDVideoCapable()) {
entries.add(getString(R.string.pref_preferred_video_size_hd));
values.add(getString(R.string.pref_preferred_video_size_hd_key));
for (String name : LinphoneManager.getLc().getSupportedVideoSizes()) {
entries.add(name);
values.add(name);
}
entries.add(getString(R.string.pref_preferred_video_size_vga));
values.add(getString(R.string.pref_preferred_video_size_vga_key));
entries.add(getString(R.string.pref_preferred_video_size_cif));
values.add(getString(R.string.pref_preferred_video_size_cif_key));
entries.add(getString(R.string.pref_preferred_video_size_qvga));
values.add(getString(R.string.pref_preferred_video_size_qvga_key));
entries.add(getString(R.string.pref_preferred_video_size_qcif));
values.add(getString(R.string.pref_preferred_video_size_qcif_key));
setListPreferenceValues(pref, entries, values);
String value = mPrefs.getPreferredVideoSize();
pref.setSummary(value);
String key = getString(R.string.pref_preferred_video_size_qvga_key);
if (value.equals(getString(R.string.pref_preferred_video_size_vga)))
key = getString(R.string.pref_preferred_video_size_vga_key);
else if (value.equals(getString(R.string.pref_preferred_video_size_hd)))
key = getString(R.string.pref_preferred_video_size_hd_key);
pref.setDefaultValue(key);
pref.setDefaultValue(value);
}
private static void setListPreferenceValues(ListPreference pref, List<CharSequence> entries, List<CharSequence> values) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2c8da39ac71f12afcf9ee639f22e56b3a5cec6dd
Subproject commit 809123e9500c15663d51b32c7129ae150f00a6da