Changeset 131a15b62ba4440b80df480f9c56448a47785800 for modules/video_output/x11

Timestamp:

20/08/08 23:18:00 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219267080 +0200

git-parent:

[35a248f1ac6304b1a9931eaee786f36b224a92f9]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219267080 +0200

Message:

Correctly set rgb mask for xvideo output too.

Files:

• modules/video_output/x11/xcommon.c (modified) (8 diffs)

modules/video_output/x11/xcommon.c

@@ -139 +139 @@
-
-#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
-vlc_fourcc
+picture_heap
-static void XVideoReleasePort( vout_thread_t *, int );
-#endif
@@ -260 +260 @@
-    /* Check that we have access to an XVideo port providing this chroma */
-    p_vout->p_sys->i_xvport = XVideoGetPort( p_vout, VLC2X11_FOURCC(i_chroma),
-.i_chroma
+
-    if( p_vout->p_sys->i_xvport < 0 )
-    {
@@ -277 +277 @@
-        p_vout->p_sys->i_xvport =
-                        XVideoGetPort( p_vout, X11_FOURCC('Y','U','Y','2'),
-.i_chroma
+
-        if( p_vout->p_sys->i_xvport < 0 )
-        {
@@ -285 +285 @@
-            p_vout->p_sys->i_xvport =
-                            XVideoGetPort( p_vout, X11_FOURCC('R','V','1','6'),
-.i_chroma
+
-            if( p_vout->p_sys->i_xvport < 0 )
-            {
@@ -822 +822 @@
-    p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
-
+#if XvVersion < 2 || ( XvVersion == 2 && XvRevision < 2 )
-    switch( p_vout->output.i_chroma )
-    {
@@ -847 +848 @@
-            break;
-    }
+#endif
-
-#elif defined(MODULE_NAME_IS_x11)
@@ -2462 +2464 @@
- *****************************************************************************/
-static int XVideoGetPort( vout_thread_t *p_vout,
-vlc_fourcc_t *pi_newchroma
+picture_heap_t *p_heap
-{
-    XvAdaptorInfo *p_adaptor;
@@ -2565 +2567 @@
-                {
-                    i_selected_port = i_port;
-
+
+
+
+
+
+
-                }
-            }