Changeset 199:d0ad66dfade4 in mediastreamer2

Timestamp:

Dec 11, 2008 10:17:17 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix various bugs.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@202 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• coreapi/linphonecore.c (modified) (1 diff)
• m4/exosip.m4 (modified) (2 diffs)
• mediastreamer2/src/videoout.c (modified) (3 diffs)

linphone/coreapi/linphonecore.c

@@ -912 +912 @@
         if (exosip_running) eXosip_quit();
         eXosip_init();
+        err=0;
+        eXosip_set_option(13,&err); /*13=EXOSIP_OPT_SRV_WITH_NAPTR, as it is an enum value, we can't use it unless we are sure of the
+                                        version of eXosip, which is not the case*/
         eXosip_enable_ipv6(lc->sip_conf.ipv6_enabled);
         if (lc->sip_conf.ipv6_enabled)

linphone/m4/exosip.m4

@@ -15 +15 @@
 dnl check for eXosip2 libs
 LDFLAGS_save=$LDFLAGS
-LDFLAGS=$OSIP_LIBS
+LDFLAGS="$OSIP_LIBS $LDFLAGS"
 LIBS_save=$LIBS
 AC_CHECK_LIB([eXosip2],[eXosip_subscribe_remove],
@@ -25 +25 @@
         [],
         [-losipparser2 -losip2 -lpthread])
+dnl AC_CHECK_LIB([eXosip2],[eXosip_get_naptr],
+dnl     [AC_DEFINE([HAVE_EXOSIP_NAPTR_SUPPORT],[1],[Defined when eXosip_get_naptr is available])],
+dnl     [],
+dnl     [-losipparser2 -losip2 -lpthread])
 LIBS=$LIBS_save
 LDFLAGS=$LDFLAGS_save

linphone/mediastreamer2/src/videoout.c

@@ -523 +523 @@
         MSRect local_rect;
         mblk_t *local_msg;
+        MSVideoSize prevsize;
         int corner;
         struct SwsContext *sws1;
@@ -590 +591 @@
         def_size.width=MS_VIDEO_SIZE_CIF_W;
         def_size.height=MS_VIDEO_SIZE_CIF_H;
+        obj->prevsize.width=0;
+        obj->prevsize.height=0;
         obj->local_msg=NULL;
         obj->corner=0;
@@ -726 +729 @@
                         newsize.width=src.w;
                         newsize.height=src.h;
-                        if (obj->autofit && !ms_video_size_equal(newsize,cur) ) {
+                        if (obj->autofit && !ms_video_size_equal(newsize,obj->prevsize) ) {
+                                obj->prevsize=newsize;
                                 /*don't resize less than QVGA, it is too small*/
                                 if (ms_video_size_greater_than(MS_VIDEO_SIZE_QVGA,newsize)){