Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
	coreapi/Makefile.am
	coreapi/linphonecore.c
	mediastreamer2

diff --git a/.gitmodules b/.gitmodules
index 0655d8e56ae99aa4cff04291206d981dad996eb7..b3e1551c1da7ceed757f5e76bd9f5c815db9e108 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
        url = git://git.linphone.org/ortp.git
 [submodule "mediastreamer2"]
        path = mediastreamer2
-       url = git://git.linphone.org/mediastreamer2.git
+       url = gitosis@git.linphone.org:mediastreamer2-private.git

diff --git a/configure.ac b/configure.ac
index 5fe32ef33749bfb48803e49b16cae3162c9b43a9..298c7986d10928545df5c3eb36833ecce3e7e4ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AM_PROG_CC_C_O
 AC_CHECK_PROGS(MD5SUM,[md5sum md5])
 AM_CONDITIONAL(HAVE_MD5SUM,test -n $MD5SUM)
 
-case $target_os in
+case $target in
        *mingw32ce)
                CFLAGS="$CFLAGS -D_WIN32_WCE -DORTP_STATIC -D_WIN32_WINNT=0x0501"
                CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
@@ -60,11 +60,18 @@ case $target_os in
                CONSOLE_FLAGS="-mconsole"
                mingw_found=yes
        ;;
-       *darwin*)
+       armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin)
+                CFLAGS="$CFLAGS -DTARGET_OS_IPHONE "
+                build_tests=no
+                ios_found=yes
+        ;;
+        x86_64-apple-darwin*|i686-apple-darwin*)
+                MSPLUGINS_CFLAGS=""
                dnl use macport installation
                ACLOCAL_MACOS_FLAGS="-I /opt/local/share/aclocal"
                build_macos=yes
-       ;;
+        ;;
+
 esac
 
 AC_SUBST(ACLOCAL_MACOS_FLAGS)
@@ -74,6 +81,7 @@ AC_SUBST(GUI_FLAGS)
 dnl localization tools
 IT_PROG_INTLTOOL([0.40], [no-xml])
 
+AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
 dnl Initialize libtool
 LT_INIT([win32-dll shared disable-static])
 

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 6ea151e0ab4ca032443cc3c0ee8310cc1f9be1e7..a5d5e8be413d793200bc69aec36df7196c52d1cc 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -49,8 +49,7 @@ liblinphone_la_LIBADD= \
 if BUILD_WIN32
 liblinphone_la_LIBADD+=$(top_builddir)/oRTP/src/libortp.la
 endif
-
-if ENABLE_TESTS
+if BUILD_TESTS
 noinst_PROGRAMS=test_lsd test_ecc
 
 test_lsd_SOURCES=test_lsd.c

diff --git a/coreapi/help/Makefile.am b/coreapi/help/Makefile.am
index 6690fd4a6379842cb90d456afd77afdccf3cd940..a68ab2f19c7cfe0b28d899ad56b42a31ff7bb3bc 100644 (file)
--- a/coreapi/help/Makefile.am
+++ b/coreapi/help/Makefile.am
@@ -34,7 +34,7 @@ clean-local:
 
 if ENABLE_TESTS
 #tutorials
-
+if BUILD_TESTS
 noinst_PROGRAMS=helloworld registration buddy_status chatroom
 
 helloworld_SOURCES=helloworld.c
@@ -60,7 +60,7 @@ LINPHONE_TUTOS+=$(chatroom_SOURCES)
 chatroom_LDADD=$(helloworld_LDADD)
 endif
                                                                                                
-                               
+endif                  
 
 INCLUDES=-I$(top_srcdir)/coreapi \
                $(MEDIASTREAMER_CFLAGS)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6abe85101f78764649486fa5f69d8ab4d16d7aa8..e442f0126b9e3754e897aeb4ddc8cb506a58672c 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2230,6 +2230,8 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 #ifdef VIDEO_ENABLED
                if (call->videostream!=NULL){
                        video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
+                       if (call->camera_active)
+                               call->videostream->cam=lc->video_conf.device; /*to take into account eventual cam changes*/
                        video_stream_update_video_params (call->videostream);
                }
 #endif
@@ -3479,7 +3481,13 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
  * If not set the core will create its own window.
 **/
 void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id){
+#ifdef VIDEO_ENABLED
        lc->preview_window_id=id;
+       LinphoneCall *call=linphone_core_get_current_call(lc);
+       if (call!=NULL && call->videostream){
+               video_stream_set_native_preview_window_id(call->videostream,id);
+       }
+#endif
 }
 
 /**

diff --git a/mediastreamer2 b/mediastreamer2
index a82dcdbf8a4e8364bdcaa6f6fb88ca087f48a780..021c5cd8cca603c6e905ec6688a4deefa995358c 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a82dcdbf8a4e8364bdcaa6f6fb88ca087f48a780
+Subproject commit 021c5cd8cca603c6e905ec6688a4deefa995358c