Skip to content

GitLab

Commit 54c3926a authored by Sylvain Berfini's avatar Sylvain Berfini
Browse files

Fix android ms2 sdk compil

parent d5cd3b14
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
build/android/Android.mk
View file @ 54c3926a
...@@ -278,6 +278,7 @@ LOCAL_STATIC_LIBRARIES += cpufeatures ...@@ -278,6 +278,7 @@ LOCAL_STATIC_LIBRARIES += cpufeatures
ifeq ($(BUILD_MEDIASTREAMER2_SDK), 1) ifeq ($(BUILD_MEDIASTREAMER2_SDK), 1)
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
../tools/common.c \
../tools/mediastream.c ../tools/mediastream.c
ifneq ($(_BUILD_AMR), 0) ifneq ($(_BUILD_AMR), 0)
...@@ -308,9 +309,7 @@ ifeq ($(BUILD_MEDIASTREAMER2_SDK), 1) ...@@ -308,9 +309,7 @@ ifeq ($(BUILD_MEDIASTREAMER2_SDK), 1)
LOCAL_STATIC_LIBRARIES += libmsopenh264 libopenh264 LOCAL_STATIC_LIBRARIES += libmsopenh264 libopenh264
endif endif
LOCAL_SHARED_LIBRARIES += \ LOCAL_SHARED_LIBRARIES += \
libavcodec-linphone \ libffmpeg-linphone
libswscale-linphone \
libavutil-linphone
LOCAL_LDLIBS += -lGLESv2 LOCAL_LDLIBS += -lGLESv2
endif endif
ifeq ($(BUILD_SRTP),1) ifeq ($(BUILD_SRTP),1)
......
tools/mediastream.c
View file @ 54c3926a
...@@ -982,8 +982,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved) ...@@ -982,8 +982,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved)
JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVideoWindowId JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVideoWindowId
(JNIEnv *env, jobject obj, jobject id, jint _args) { (JNIEnv *env, jobject obj, jobject id, jint _args) {
MediastreamDatas* args = (MediastreamDatas*)_args;
#ifdef VIDEO_ENABLED #ifdef VIDEO_ENABLED
MediastreamDatas* args = (MediastreamDatas*)_args;
if (!args->video) if (!args->video)
return; return;
video_stream_set_native_window_id(args->video,(unsigned long)id); video_stream_set_native_window_id(args->video,(unsigned long)id);
...@@ -992,8 +992,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVi ...@@ -992,8 +992,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVi
JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVideoPreviewWindowId JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVideoPreviewWindowId
(JNIEnv *env, jobject obj, jobject id, jint _args) { (JNIEnv *env, jobject obj, jobject id, jint _args) {
MediastreamDatas* args = (MediastreamDatas*)_args;
#ifdef VIDEO_ENABLED #ifdef VIDEO_ENABLED
MediastreamDatas* args = (MediastreamDatas*)_args;
if (!args->video) if (!args->video)
return; return;
video_stream_set_native_preview_window_id(args->video,(unsigned long)id); video_stream_set_native_preview_window_id(args->video,(unsigned long)id);
...@@ -1002,8 +1002,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVi ...@@ -1002,8 +1002,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setVi
JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setDeviceRotation JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setDeviceRotation
(JNIEnv *env, jobject thiz, jint rotation, jint _args) { (JNIEnv *env, jobject thiz, jint rotation, jint _args) {
MediastreamDatas* args = (MediastreamDatas*)_args;
#ifdef VIDEO_ENABLED #ifdef VIDEO_ENABLED
MediastreamDatas* args = (MediastreamDatas*)_args;
if (!args->video) if (!args->video)
return; return;
video_stream_set_device_rotation(args->video, rotation); video_stream_set_device_rotation(args->video, rotation);
...@@ -1012,8 +1012,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setDe ...@@ -1012,8 +1012,8 @@ JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_setDe
JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_changeCamera JNIEXPORT void JNICALL Java_org_linphone_mediastream_MediastreamerActivity_changeCamera
(JNIEnv *env, jobject obj, jint camId, jint _args) { (JNIEnv *env, jobject obj, jint camId, jint _args) {
MediastreamDatas* args = (MediastreamDatas*)_args;
#ifdef VIDEO_ENABLED #ifdef VIDEO_ENABLED
MediastreamDatas* args = (MediastreamDatas*)_args;
if (!args->video) if (!args->video)
return; return;
char* id = (char*)malloc(15); char* id = (char*)malloc(15);
......
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