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

Remove old code which break AEC software in some cases

Browse source
This commit is contained in:
Erwan Croze 2017-01-27 11:58:17 +01:00
parent 762ef34d4e
commit 4ce4a2a869
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -763,6 +763,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
private synchronized void initLiblinphone(LinphoneCore lc) throws LinphoneCoreException { private synchronized void initLiblinphone(LinphoneCore lc) throws LinphoneCoreException {
mLc = lc; mLc = lc;
PreferencesMigrator prefMigrator = new PreferencesMigrator(mServiceContext); PreferencesMigrator prefMigrator = new PreferencesMigrator(mServiceContext);
prefMigrator.migrateRemoteProvisioningUriIfNeeded(); prefMigrator.migrateRemoteProvisioningUriIfNeeded();
prefMigrator.migrateSharingServerUrlIfNeeded(); prefMigrator.migrateSharingServerUrlIfNeeded();
@ -772,14 +773,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
prefMigrator.doMigration(); prefMigrator.doMigration();
} }
// Some devices could be using software AEC before
// This will disable it in favor of hardware AEC if available
if (prefMigrator.isEchoMigratioNeeded()) {
Log.d("Echo canceller configuration need to be updated");
prefMigrator.doEchoMigration();
mPrefs.echoConfigurationUpdated();
}
mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets"); mLc.setZrtpSecretsCache(basePath + "/zrtp_secrets");
try { try {

11
src/org/linphone/PreferencesMigrator.java
View file

@ -59,17 +59,6 @@ public class PreferencesMigrator {
return (!lc.needsEchoCalibration() && mNewPrefs.isEchoCancellationEnabled()); return (!lc.needsEchoCalibration() && mNewPrefs.isEchoCancellationEnabled());
} }
public void doEchoMigration() {
LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
if (lc == null) {
return;
}
if (!lc.needsEchoCalibration()) {
mNewPrefs.setEchoCancellation(false);
}
}
public boolean isMigrationNeeded() { public boolean isMigrationNeeded() {
int accountNumber = mOldPrefs.getInt(getString(R.string.pref_extra_accounts), -1); int accountNumber = mOldPrefs.getInt(getString(R.string.pref_extra_accounts), -1);
return accountNumber != -1; return accountNumber != -1;