Changeset 1177:6a8f9aa8bcf1 in mediastreamer2

Timestamp:

Oct 20, 2010 9:32:56 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

fix crash when x11 window is too small, and improve Xv detection in configure script

Files:

• acinclude.m4 (modified) (2 diffs)
• src/layouts.h (modified) (1 diff)
• src/x11video.c (modified) (1 diff)

acinclude.m4

@@ -153 +153 @@
 
                         if test "$enable_xv" = "true"; then
-                           AC_CHECK_HEADERS(X11/extensions/Xv.h,[] ,[enable_xv=false])
+                                AC_CHECK_HEADERS(X11/extensions/Xv.h,[] ,[enable_xv=false])
+                                AC_CHECK_HEADERS(X11/extensions/Xvlib.h,[] ,[enable_xv=false],[
+                                        #include <X11/Xlib.h>
+                                ])
                            AC_CHECK_LIB(Xv,XvCreateImage,[LIBS="$LIBS -lXv"])
                          fi
@@ -159 +162 @@
                 
                 if ! test "$mingw_found" = "yes" ; then
-                        if test "$enable_xv$sdl_found" == "nono" ; then
+                        if test "$enable_xv$sdl_found" == "falsefalse" ; then
                                 AC_MSG_ERROR([No video output API found. Install either X11+Xv headers or SDL library.])
                         fi

src/layouts.h

@@ -27 +27 @@
 #endif
 
+#define MS_LAYOUT_MIN_SIZE 40
+
 void ms_layout_compute(MSVideoSize wsize, MSVideoSize vsize, MSVideoSize orig_psize,
                        int localrect_pos, float scalefactor, MSRect *mainrect, MSRect *localrect);

src/x11video.c

@@ -182 +182 @@
         XGetWindowAttributes(s->display,s->window_id,&wa);
         ms_message("Window has size %i,%i",wa.width,wa.height);
+
+        if (wa.width<MS_LAYOUT_MIN_SIZE || wa.height<MS_LAYOUT_MIN_SIZE){
+                return;
+        }
         
         s->fbuf.w=wa.width & ~0x1;