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

Fix for when using software echo cancellation + updated liblinphone

Browse source
This commit is contained in:
Sylvain Berfini 2014-07-10 14:35:11 +02:00
parent d2f91f5a84
commit 1786e45523
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/raw/linphonerc_factory
View file

@ -29,9 +29,6 @@ rtcp_xr_voip_metrics_enabled=1
playback_dev_id= playback_dev_id=
ringer_dev_id= ringer_dev_id=
capture_dev_id= capture_dev_id=
#playback_dev_id=ANDROID SND (deprecated): Android Sound card
#ringer_dev_id=ANDROID SND (deprecated): Android Sound card
#capture_dev_id=ANDROID SND (deprecated): Android Sound card
remote_ring=/data/data/org.linphone/files/ringback.wav remote_ring=/data/data/org.linphone/files/ringback.wav
local_ring=/data/data/org.linphone/files/oldphone_mono.wav local_ring=/data/data/org.linphone/files/oldphone_mono.wav
dtmf_player_amp=0.1 dtmf_player_amp=0.1

6
src/org/linphone/setup/SetupActivity.java
View file

@ -168,7 +168,8 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
} }
private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) { private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) {
if (LinphoneManager.getLc().needsEchoCalibration() && mPrefs.isFirstLaunch()) { boolean needsEchoCalibration = LinphoneManager.getLc().needsEchoCalibration();
if (needsEchoCalibration && mPrefs.isFirstLaunch()) {
EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment(); EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment();
fragment.enableEcCalibrationResultSending(sendEcCalibrationResult); fragment.enableEcCalibrationResultSending(sendEcCalibrationResult);
changeFragment(fragment); changeFragment(fragment);
@ -178,6 +179,9 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
next.setEnabled(false); next.setEnabled(false);
cancel.setEnabled(false); cancel.setEnabled(false);
} else { } else {
if (mPrefs.isFirstLaunch()) {
mPrefs.setEchoCancellation(false);
}
success(); success();
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit b5aeb7e7553ed1efc8d91384b29bf4116def4545 Subproject commit b4687141227948a321867dddbc815522710b4f3f