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

Added libneon to detect neon in NDK instead of reading /proc/cpuinfo

Browse source
This commit is contained in:
Sylvain Berfini 2013-01-18 11:50:31 +01:00
parent 28d71039db
commit d98729b8aa
6 changed files with 111 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
jni/Android.mk
View file

@ -19,6 +19,7 @@ LINPHONE_VIDEO=0
BUILD_X264=0
endif
include $(linphone-root-dir)/jni/libneon/Android.mk
##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP), 1)

2
jni/Application.mk
View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone liblinphonenoneon
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone liblinphonenoneon libneon
APP_STL := stlport_static
#default values

37
jni/libneon/Android.mk Executable file
View file

@ -0,0 +1,37 @@
##
## Android.mk -Android build script-
##
##
## 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.
##
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := \
libneon_jni.cc
LOCAL_STATIC_LIBRARIES := cpufeatures
LOCAL_MODULE := libneon
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/cpufeatures)

37
jni/libneon/libneon_jni.cc Normal file
View file

@ -0,0 +1,37 @@
/*
libneon_jni.cc
Copyright (C) 2013 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.
*/
#include <jni.h>
extern "C" {
#include <cpu-features.h>
#include <android/log.h>
static JavaVM *jvm=0;
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved)
{
jvm=ajvm;
return JNI_VERSION_1_2;
}
extern "C" jboolean Java_org_linphone_CpuUtils_hasNeon(JNIEnv* env, jobject thiz) {
return android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON;
}
}

34
src/org/linphone/CpuUtils.java Normal file
View file

@ -0,0 +1,34 @@
package org.linphone;
/*
CpuUtils.java
Copyright (C) 2013 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.
*/
/**
* @author Sylvain Berfini
*/
public class CpuUtils {
private native boolean hasNeon();
public CpuUtils() {
}
public boolean isCpuNeon() {
return hasNeon();
}
}

2
submodules/linphone

@ -1 +1 @@
Subproject commit d496d958452a3147eeefb9ba01be233b5b4f0b58
Subproject commit ebfa43d5b22d986b5d0076cd04a8d0e8fbfd7fd8