mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Switch submodule branch] [Outgrade submodule]

Browse source
This commit is contained in:
Erwan Croze 2017-01-20 14:18:22 +01:00
parent 1dd10af9fa
commit de68bfca93
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/LinphoneManager.java
View file

@ -227,7 +227,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void initOpenH264DownloadHelper() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
Log.i("Android >= 5.1 we disable the download of OpenH264");
getLc().enableDownloadOpenH264(false);
getLc().enableOpenH264(false);
return;
}

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

@ -691,7 +691,7 @@ public class SettingsFragment extends PreferencesListFragment {
}
}
}
if (lc.downloadOpenH264Enabled()) {
if (lc.openH264Enabled()) {
if (pt.getMime().equals("H264") && mCodecDownloader.isCodecFound()) {
codec.setSummary(mCodecDownloader.getLicenseMessage());
codec.setTitle("OpenH264");
@ -704,7 +704,7 @@ public class SettingsFragment extends PreferencesListFragment {
public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean enable = (Boolean) newValue;
try {
if (lc.downloadOpenH264Enabled()) {
if (lc.openH264Enabled()) {
if (enable && Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86")
&& pt.getMime().equals("H264") && !mCodecDownloader.isCodecFound()) {
mCodecDownloader.setOpenH264HelperListener(LinphoneManager.getInstance().getOpenH264HelperListener());

2
src/org/linphone/StatusFragment.java
View file

@ -457,7 +457,7 @@ public class StatusFragment extends Fragment {
title.setVisibility(TextView.VISIBLE);
if (media != null) {
String mime = media.getMime();
if (LinphoneManager.getLc().downloadOpenH264Enabled() &&
if (LinphoneManager.getLc().openH264Enabled() &&
media.getMime().equals("H264") &&
LinphoneManager.getInstance().getOpenH264DownloadHelper().isCodecFound()) {
mime = "OpenH264";

2
src/org/linphone/assistant/AssistantActivity.java
View file

@ -440,7 +440,7 @@ private static AssistantActivity instance;
}
private void launchDownloadCodec() {
if (LinphoneManager.getLc().downloadOpenH264Enabled()) {
if (LinphoneManager.getLc().openH264Enabled()) {
OpenH264DownloadHelper downloadHelper = LinphoneCoreFactory.instance().createOpenH264DownloadHelper();
if (Version.getCpuAbis().contains("armeabi-v7a") && !Version.getCpuAbis().contains("x86") && !downloadHelper.isCodecFound()) {
CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 7254fe94e7155f0164fca177f8bf54ab82b76e84
Subproject commit 058967d340a97d7a4c155490398162b24c2ea399

2
submodules/belcard

@ -1 +1 @@
Subproject commit ebd037585965ce80f01be5290abc7e5455009eb8
Subproject commit eaeab2d665423e1fdbf2f59c2ae8da6c3c89c8fa

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit b1695fb52ede996ed0b50167aab787d1373f49e4
Subproject commit 8d49d18532e1addebd21b61fc6a13920057bcd5b

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2b407fabfae4db9029190444b3c59ffee39b1efd
Subproject commit 942f2034630b0ea50a1394f5c79d676114435e2e