diff --git a/LinphoneCoreFactoryImpl.java b/LinphoneCoreFactoryImpl.java index 674b62450..19b0282f3 100644 --- a/LinphoneCoreFactoryImpl.java +++ b/LinphoneCoreFactoryImpl.java @@ -35,6 +35,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; +import org.linphone.mediastream.Version; + public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { private static void loadOptionalLibrary(String s) { diff --git a/Version.java b/Version.java deleted file mode 100644 index edbb25e8e..000000000 --- a/Version.java +++ /dev/null @@ -1,85 +0,0 @@ -/* -Version.java -Copyright (C) 2010 Belledonne Communications, Grenoble, France - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ -package org.linphone.core; - -import org.linphone.mediastream.video.capture.hwconf.Hacks; - -import android.os.Build; - -/** - * Centralize version access and allow simulation of lower versions. - * @author Guillaume Beraudo - */ -public class Version { - - public static final int API03_CUPCAKE_15 = 3; - public static final int API04_DONUT_16 = 4; - public static final int API06_ECLAIR_20 = 6; - public static final int API07_ECLAIR_21 = 7; - public static final int API08_FROYO_22 = 8; - public static final int API09_GINGERBREAD_23 = 9; - public static final int API11_HONEYCOMB_30 = 11; - - private static native boolean nativeHasZrtp(); - private static native boolean nativeHasNeon(); - private static Boolean hasNeon; - - private static final int buildVersion = - Integer.parseInt(Build.VERSION.SDK); -// 8; // 2.2 -// 7; // 2.1 - - public static final boolean sdkAboveOrEqual(int value) { - return buildVersion >= value; - } - - public static final boolean sdkStrictlyBelow(int value) { - return buildVersion < value; - } - - public static int sdk() { - return buildVersion; - } - - public static boolean isArmv7() { - try { - return sdkAboveOrEqual(4) - && Build.class.getField("CPU_ABI").get(null).toString().startsWith("armeabi-v7"); - } catch (Throwable e) {} - return false; - } - public static boolean hasNeon(){ - if (hasNeon == null) hasNeon = nativeHasNeon(); - return hasNeon; - } - public static boolean isVideoCapable() { - return !Version.sdkStrictlyBelow(5) && Version.hasNeon() && Hacks.hasCamera(); - } - - public static boolean hasZrtp(){ - return nativeHasZrtp(); - } - - public static void dumpCapabilities(){ - StringBuilder sb = new StringBuilder(" ==== Capabilities dump ====\n"); - sb.append("Has neon: ").append(Boolean.toString(hasNeon())).append("\n"); - sb.append("Has ZRTP: ").append(Boolean.toString(hasZrtp())).append("\n"); - Log.i(sb.toString()); - } -}