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

fix bug forcing low quality audio calls when network type is unchecked.

Browse source
This commit is contained in:
Simon Morlat 2015-03-25 16:48:00 +01:00
parent 8e59bd9c1d
commit 38f0af6ebe
3 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,7 +169,7 @@ public class IncomingCallActivity extends Activity implements LinphoneSliderTrig
private void answer() { private void answer() {
LinphoneCallParams params = LinphoneManager.getLc().createDefaultCallParameters(); LinphoneCallParams params = LinphoneManager.getLc().createDefaultCallParameters();
boolean isLowBandwidthConnection = !LinphoneUtils.isHightBandwidthConnection(this); boolean isLowBandwidthConnection = !LinphoneUtils.isHighBandwidthConnection(this);
if (isLowBandwidthConnection) { if (isLowBandwidthConnection) {
params.enableLowBandwidth(true); params.enableLowBandwidth(true);
Log.d("Low bandwidth enabled in call params"); Log.d("Low bandwidth enabled in call params");

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

@ -296,7 +296,7 @@ public class LinphoneManager implements LinphoneCoreListener {
} }
lAddress.setDisplayName(displayName); lAddress.setDisplayName(displayName);
boolean isLowBandwidthConnection = !LinphoneUtils.isHightBandwidthConnection(LinphoneService.instance().getApplicationContext()); boolean isLowBandwidthConnection = !LinphoneUtils.isHighBandwidthConnection(LinphoneService.instance().getApplicationContext());
if (mLc.isNetworkReachable()) { if (mLc.isNetworkReachable()) {
try { try {

39
src/org/linphone/LinphoneUtils.java
View file

@ -296,54 +296,23 @@ public final class LinphoneUtils {
state == LinphoneCall.State.Pausing; state == LinphoneCall.State.Pausing;
} }
public static boolean isHightBandwidthConnection(Context context){ public static boolean isHighBandwidthConnection(Context context){
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo info = cm.getActiveNetworkInfo(); NetworkInfo info = cm.getActiveNetworkInfo();
return (info != null && info.isConnected() && isConnectionFast(info.getType(),info.getSubtype())); return (info != null && info.isConnected() && isConnectionFast(info.getType(),info.getSubtype()));
} }
private static boolean isConnectionFast(int type, int subType){ private static boolean isConnectionFast(int type, int subType){
if (type == ConnectivityManager.TYPE_WIFI) { if (type == ConnectivityManager.TYPE_MOBILE) {
return true;
} else if (type == ConnectivityManager.TYPE_MOBILE) {
switch (subType) { switch (subType) {
case TelephonyManager.NETWORK_TYPE_1xRTT:
return false; // ~ 50-100 kbps
case TelephonyManager.NETWORK_TYPE_CDMA:
return false; // ~ 14-64 kbps
case TelephonyManager.NETWORK_TYPE_EDGE: case TelephonyManager.NETWORK_TYPE_EDGE:
return false; // ~ 50-100 kbps
case TelephonyManager.NETWORK_TYPE_GPRS: case TelephonyManager.NETWORK_TYPE_GPRS:
return false; // ~ 100 kbps
case TelephonyManager.NETWORK_TYPE_EVDO_0:
return false; // ~25 kbps
case TelephonyManager.NETWORK_TYPE_LTE:
return true; // ~ 400-1000 kbps
case TelephonyManager.NETWORK_TYPE_EVDO_A:
return true; // ~ 600-1400 kbps
case TelephonyManager.NETWORK_TYPE_HSDPA:
return true; // ~ 2-14 Mbps
case TelephonyManager.NETWORK_TYPE_HSPA:
return true; // ~ 700-1700 kbps
case TelephonyManager.NETWORK_TYPE_HSUPA:
return true; // ~ 1-23 Mbps
case TelephonyManager.NETWORK_TYPE_UMTS:
return true; // ~ 400-7000 kbps
case TelephonyManager.NETWORK_TYPE_EHRPD:
return true; // ~ 1-2 Mbps
case TelephonyManager.NETWORK_TYPE_EVDO_B:
return true; // ~ 5 Mbps
case TelephonyManager.NETWORK_TYPE_HSPAP:
return true; // ~ 10-20 Mbps
case TelephonyManager.NETWORK_TYPE_IDEN: case TelephonyManager.NETWORK_TYPE_IDEN:
return true; // ~ 10+ Mbps
case TelephonyManager.NETWORK_TYPE_UNKNOWN:
default:
return false; return false;
} }
} else {
return false;
} }
//in doubt, assume connection is good.
return true;
} }
public static void clearLogs() { public static void clearLogs() {