android display works

diff --git a/build/android/Android.mk b/build/android/Android.mk
index c0e8df8a2967334b5e59c9542b32b9dc513a4c1e..6b9dc85c1b0c1746ad4e375c727aff4fa589a6e4 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -70,7 +70,7 @@ LOCAL_C_INCLUDES += \
        $(LOCAL_PATH)/../../externals/exosip/include \
        $(LOCAL_PATH)/../../externals/osip/include 
 
-LOCAL_LDLIBS += -llog
+LOCAL_LDLIBS += -llog -ldl
 
 LOCAL_STATIC_LIBRARIES := \
        libmediastreamer2 \

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index e6e8d99f2177b89e0255d265dc453dc795e3c355..6ceb9b127c980f86f4d5689573509ba1499c6292 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3333,7 +3333,13 @@ unsigned long linphone_core_get_native_video_window_id(const LinphoneCore *lc){
  * If not set the core will create its own window.
 **/
 void linphone_core_set_native_video_window_id(LinphoneCore *lc, unsigned long id){
+#ifdef VIDEO_ENABLED
+       LinphoneCall *call=linphone_core_get_current_call(lc);
        lc->video_window_id=id;
+       if (call!=NULL && call->videostream){
+               video_stream_set_native_window_id(call->videostream,id);
+       }
+#endif
 }
 
 /**
@@ -4034,3 +4040,4 @@ const char *linphone_error_to_string(LinphoneReason err){
        }
        return "unknown error";
 }
+

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b339327e03d72823435c927476819105437d9b58..029cb30bce1476521441a1a421505047b4ec22e4 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -943,3 +943,12 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendMessage(JNIEnv*
 
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv* env
+                                                                                                                                               ,jobject thiz
+                                                                                                                                               ,jlong lc
+                                                                                                                                               ,jobject obj) {
+       linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
+       ms_message("linphone_core_set_native_video_window_id() called !!!!!!!");
+}
+
+