Changeset 55da14ec974e67d4197a8547a2a26ed540feded9

Timestamp:

03/05/08 22:37:14 (6 months ago)

Author:

Gildas Bazin <gildas@videolan.org>

git-committer:

Gildas Bazin <gildas@videolan.org> 1204753034 +0000

git-parent:

[f26a646b38f93d0386141ee760fab791697fa84b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1204577897 +0000

Message:

* modules/video_output/x11/*: manually paint the xv colour key if XV_AUTOPAINT_COLORKEY isn't supported.

Files:

• modules/video_output/x11/xcommon.c (modified) (5 diffs)
• modules/video_output/x11/xcommon.h (modified) (2 diffs)

modules/video_output/x11/xcommon.c

@@ -1435 +1435 @@
-            {
-                /* (if this is the last a collection of expose events...) */
+
+#if defined(MODULE_NAME_IS_xvideo)
+                x11_window_t *p_win = p_vout->p_sys->p_win;
+
+                /* Paint the colour key if needed */
+                if( p_vout->p_sys->b_paint_colourkey &&
+                    xevent.xexpose.window == p_win->video_window )
+                {
+                    XSetForeground( p_vout->p_sys->p_display,
+                                    p_win->gc, p_vout->p_sys->i_colourkey );
+                    XFillRectangle( p_vout->p_sys->p_display,
+                                    p_win->video_window, p_win->gc, 0, 0,
+                                    p_win->i_width, p_win->i_height );
+                }
+#endif 
+
-#if 0
-                if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL )
@@ -1623 +1639 @@
-    if( !p_vout->b_fullscreen )
-    {
-
-
+
+
+
-
-        xsize_hints.base_width  = xsize_hints.width = p_win->i_width;
@@ -2552 +2569 @@
-            XvAttribute     *p_attr;
-            int             i_attr, i_num_attributes;
+            Atom            autopaint = None, colorkey = None;
-
-            /* If this is not the format we want, or at least a
@@ -2588 +2606 @@
-                         "packed" : "planar" );
-
-
+
+
-            p_attr = XvQueryPortAttributes( p_vout->p_sys->p_display,
-                                            i_selected_port,
@@ -2597 +2616 @@
-                if( !strcmp( p_attr[i_attr].name, "XV_AUTOPAINT_COLORKEY" ) )
-                {
-
-
-
+
+
-                    XvSetPortAttribute( p_vout->p_sys->p_display,
-                                        i_selected_port, autopaint, 1 );
-
+
+
+
+
+
+
+
+
+
-                }
-            }
+            p_vout->p_sys->b_paint_colourkey =
+                autopaint == None && colorkey != None;
-
-            if( p_attr != NULL )

modules/video_output/x11/xcommon.h

@@ -231 +231 @@
-#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
-    int                 i_xvport;
+    vlc_bool_t          b_paint_colourkey;
+    int                 i_colourkey;
-#else
-    Colormap            colormap;               /* colormap used (8bpp only) */
@@ -337 +339 @@
-    int                 i_backlight_on_counter;
-#endif
-
- 
-};
-