Commit 7738a9ad authored by Ghislain MARY's avatar Ghislain MARY

Fix build with Android NDK 10.

parent 59c77382
......@@ -195,6 +195,9 @@ set(VOIP_SOURCE_FILES_ASM )
if(ENABLE_ALSA)
list(APPEND VOIP_SOURCE_FILES_C audiofilters/alsa.c)
endif()
if(ANDROID)
list(APPEND VOIP_SOURCE_FILES_CXX voip/msvoip_jni.cc)
endif()
if(ENABLE_ANDROIDSND)
list(APPEND VOIP_SOURCE_FILES_CXX
android/androidsound.cpp
......
......@@ -207,21 +207,6 @@ extern MSWebCamDesc static_image_desc;
extern MSWebCamDesc ms_mire_webcam_desc;
#ifdef ANDROID
extern MSWebCamDesc ms_android_video_capture_desc;
JNIEXPORT void JNICALL Java_org_linphone_mediastream_Factory_setDeviceInfo(JNIEnv* env, jobject obj,
jlong factoryPtr, jstring jmanufacturer, jstring jmodel, jstring jplatform, jint flags, jint delay, jint recommended_rate) {
const char *manufacturer = (*env)->GetStringUTFChars(env, jmanufacturer, NULL);
const char *model = (*env)->GetStringUTFChars(env, jmodel, NULL);
const char *platform = (*env)->GetStringUTFChars(env, jplatform, NULL);
ms_message("Device infos: [%s,%s,%s], Flags: %d, Delay: %d, Rate: %d",manufacturer,model,platform,flags,delay,recommended_rate);
ms_devices_info_add(((MSFactory *) factoryPtr)->devices_info, manufacturer, model, platform, flags, delay, recommended_rate);
(*env)->ReleaseStringUTFChars(env, jmanufacturer, manufacturer);
(*env)->ReleaseStringUTFChars(env, jmodel, model);
(*env)->ReleaseStringUTFChars(env, jplatform, platform);
}
#endif
#if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
......
/*
mediastreamer2 library - modular sound and video processing and streaming
Copyright (C) 2016 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <jni.h>
extern "C" {
#include <mediastreamer2/msfactory.h>
#include <mediastreamer2/devices.h>
}
static const char* GetStringUTFChars(JNIEnv* env, jstring string) {
const char *cstring = string ? env->GetStringUTFChars(string, NULL) : NULL;
return cstring;
}
static void ReleaseStringUTFChars(JNIEnv* env, jstring string, const char *cstring) {
if (string) env->ReleaseStringUTFChars(string, cstring);
}
JNIEXPORT void JNICALL Java_org_linphone_mediastream_Factory_setDeviceInfo(JNIEnv* env, jobject obj,
jlong factoryPtr, jstring jmanufacturer, jstring jmodel, jstring jplatform, jint flags, jint delay, jint recommended_rate) {
const char *manufacturer = GetStringUTFChars(env, jmanufacturer);
const char *model = GetStringUTFChars(env, jmodel);
const char *platform = GetStringUTFChars(env, jplatform);
ms_message("Device infos: [%s,%s,%s], Flags: %d, Delay: %d, Rate: %d",manufacturer,model,platform,flags,delay,recommended_rate);
ms_devices_info_add(((MSFactory *) factoryPtr)->devices_info, manufacturer, model, platform, flags, delay, recommended_rate);
ReleaseStringUTFChars(env, jmanufacturer, manufacturer);
ReleaseStringUTFChars(env, jmodel, model);
ReleaseStringUTFChars(env, jplatform, platform);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment