*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2.0
+ * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
****************************************************************************/
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
-#include <vlc_window.h>
+#include <vlc_vout_display.h>
+#include <vlc_picture_pool.h>
+#include <vlc_dialog.h>
#include "xcb_vlc.h"
-#define DISPLAY_TEXT N_("X11 display")
-#define DISPLAY_LONGTEXT N_( \
- "X11 hardware display to use. By default VLC will " \
- "use the value of the DISPLAY environment variable.")
+#define ADAPTOR_TEXT N_("XVideo adaptor number")
+#define ADAPTOR_LONGTEXT N_( \
+ "XVideo hardware adaptor to use. By default, VLC will " \
+ "use the first functional adaptor.")
#define SHM_TEXT N_("Use shared memory")
#define SHM_LONGTEXT N_( \
*/
vlc_module_begin ()
set_shortname (N_("XVideo"))
- set_description (N_("(Experimental) XVideo output"))
+ set_description (N_("XVideo output (XCB)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
- set_capability ("video output", 0)
+ set_capability ("vout display", 155)
set_callbacks (Open, Close)
- add_string ("x11-display", NULL, NULL,
- DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
+ add_integer ("xvideo-adaptor", -1, NULL,
+ ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true)
add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
- add_shortcut ("xcb-xv")
+ add_deprecated_alias ("xvideo-shm")
+ add_shortcut ("xcb-xv", "xv", "xvideo", "xid")
vlc_module_end ()
-struct vout_sys_t
+#define MAX_PICTURES (128)
+
+struct vout_display_sys_t
{
xcb_connection_t *conn;
- xcb_xv_query_adaptors_reply_t *adaptors;
vout_window_t *embed;/* VLC window */
+ xcb_cursor_t cursor; /* blank cursor */
xcb_window_t window; /* drawable X window */
xcb_gcontext_t gc; /* context to put images */
xcb_xv_port_t port; /* XVideo port */
uint32_t id; /* XVideo format */
uint16_t width; /* display width */
uint16_t height; /* display height */
+ uint32_t data_size; /* picture byte size (for non-SHM) */
+ bool swap_uv; /* U/V pointer must be swapped in a picture */
bool shm; /* whether to use MIT-SHM */
+ bool visible; /* whether it makes sense to draw at all */
+
+ xcb_xv_query_image_attributes_reply_t *att;
+ picture_pool_t *pool; /* picture pool */
+ picture_resource_t resource[MAX_PICTURES];
};
-static int Init (vout_thread_t *);
-static void Deinit (vout_thread_t *);
-static void Display (vout_thread_t *, picture_t *);
-static int Manage (vout_thread_t *);
-
-int CheckError (vout_thread_t *vout, const char *str, xcb_void_cookie_t ck)
-{
- xcb_generic_error_t *err;
-
- err = xcb_request_check (vout->p_sys->conn, ck);
- if (err)
- {
- msg_Err (vout, "%s: X11 error %d", str, err->error_code);
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
+static picture_pool_t *Pool (vout_display_t *, unsigned);
+static void Display (vout_display_t *, picture_t *);
+static int Control (vout_display_t *, int, va_list);
+static void Manage (vout_display_t *);
/**
* Check that the X server supports the XVideo extension.
*/
-static bool CheckXVideo (vout_thread_t *vout, xcb_connection_t *conn)
+static bool CheckXVideo (vout_display_t *vd, xcb_connection_t *conn)
{
xcb_xv_query_extension_reply_t *r;
xcb_xv_query_extension_cookie_t ck = xcb_xv_query_extension (conn);
bool ok = false;
+ /* We need XVideo 2.2 for PutImage */
r = xcb_xv_query_extension_reply (conn, ck, NULL);
- if (r != NULL)
- { /* We need XVideo 2.2 for PutImage */
- if ((r->major > 2) || (r->major == 2 && r->minor >= 2))
- {
- msg_Dbg (vout, "using XVideo extension v%"PRIu8".%"PRIu8,
- r->major, r->minor);
- ok = true;
- }
- else
- msg_Dbg (vout, "XVideo extension too old (v%"PRIu8".%"PRIu8,
- r->major, r->minor);
- free (r);
- }
+ if (r == NULL)
+ msg_Dbg (vd, "XVideo extension not available");
+ else
+ if (r->major != 2)
+ msg_Dbg (vd, "XVideo extension v%"PRIu8".%"PRIu8" unknown",
+ r->major, r->minor);
+ else
+ if (r->minor < 2)
+ msg_Dbg (vd, "XVideo extension v%"PRIu8".%"PRIu8" too old",
+ r->major, r->minor);
else
- msg_Dbg (vout, "XVideo extension not available");
- return ok;
-}
-
-/**
- * Get a list of XVideo adaptors for a given window.
- */
-static xcb_xv_query_adaptors_reply_t *GetAdaptors (vout_window_t *wnd,
- xcb_connection_t *conn)
-{
- xcb_xv_query_adaptors_cookie_t ck;
-
- ck = xcb_xv_query_adaptors (conn, wnd->handle.xid);
- return xcb_xv_query_adaptors_reply (conn, ck, NULL);
-}
-
-#define p_vout vout
-
-/**
- * Probe the X server.
- */
-static int Open (vlc_object_t *obj)
-{
- vout_thread_t *vout = (vout_thread_t *)obj;
- vout_sys_t *p_sys = malloc (sizeof (*p_sys));
- if (p_sys == NULL)
- return VLC_ENOMEM;
-
- vout->p_sys = p_sys;
-
- /* Connect to X */
- p_sys->conn = Connect (obj);
- if (p_sys->conn == NULL)
- return VLC_EGENERIC;
-
- if (!CheckXVideo (vout, p_sys->conn))
- {
- msg_Warn (vout, "Please enable XVideo 2.2 for faster video display");
- xcb_disconnect (p_sys->conn);
- return VLC_EGENERIC;
- }
-
- const xcb_screen_t *screen;
- p_sys->embed = GetWindow (vout, p_sys->conn, &screen, &p_sys->shm);
- if (p_sys->embed == NULL)
- {
- xcb_disconnect (p_sys->conn);
- return VLC_EGENERIC;
- }
-
- /* Cache adaptors infos */
- p_sys->adaptors = GetAdaptors (p_sys->embed, p_sys->conn);
- if (p_sys->adaptors == NULL)
- goto error;
-
- /* Create window */
{
- const uint32_t mask =
- /* XCB_CW_EVENT_MASK */
- XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
- XCB_EVENT_MASK_POINTER_MOTION;
- xcb_void_cookie_t c;
- xcb_window_t window = xcb_generate_id (p_sys->conn);
-
- c = xcb_create_window_checked (p_sys->conn, screen->root_depth, window,
- p_sys->embed->handle.xid, 0, 0, 1, 1, 0,
- XCB_WINDOW_CLASS_INPUT_OUTPUT,
- screen->root_visual,
- XCB_CW_EVENT_MASK, &mask);
- if (CheckError (vout, "cannot create X11 window", c))
- goto error;
- p_sys->window = window;
- msg_Dbg (vout, "using X11 window %08"PRIx32, p_sys->window);
- xcb_map_window (p_sys->conn, window);
+ msg_Dbg (vd, "using XVideo extension v%"PRIu8".%"PRIu8,
+ r->major, r->minor);
+ ok = true;
}
-
- p_sys->gc = xcb_generate_id (p_sys->conn);
- xcb_create_gc (p_sys->conn, p_sys->gc, p_sys->window, 0, NULL);
- msg_Dbg (vout, "using X11 graphic context %08"PRIx32, p_sys->gc);
-
- vout->pf_init = Init;
- vout->pf_end = Deinit;
- vout->pf_display = Display;
- vout->pf_manage = Manage;
- return VLC_SUCCESS;
-
-error:
- Close (obj);
- return VLC_EGENERIC;
-}
-
-
-/**
- * Disconnect from the X server.
- */
-static void Close (vlc_object_t *obj)
-{
- vout_thread_t *vout = (vout_thread_t *)obj;
- vout_sys_t *p_sys = vout->p_sys;
-
- free (p_sys->adaptors);
- vout_ReleaseWindow (p_sys->embed);
- xcb_disconnect (p_sys->conn);
- free (p_sys);
+ free (r);
+ return ok;
}
-static vlc_fourcc_t ParseFormat (vout_thread_t *vout,
+static vlc_fourcc_t ParseFormat (vout_display_t *vd,
const xcb_xv_image_format_info_t *restrict f)
{
if (f->byte_order != ORDER && f->bpp != 8)
{
case 32:
if (f->depth == 24)
- return VLC_FOURCC ('R', 'V', '3', '2');
+ return VLC_CODEC_RGB32;
+ if (f->depth == 32)
+ return 0; /* ARGB -> VLC cannot do that currently */
break;
case 24:
if (f->depth == 24)
- return VLC_FOURCC ('R', 'V', '2', '4');
+ return VLC_CODEC_RGB24;
break;
case 16:
if (f->depth == 16)
- return VLC_FOURCC ('R', 'V', '1', '6');
+ return VLC_CODEC_RGB16;
if (f->depth == 15)
- return VLC_FOURCC ('R', 'V', '1', '5');
+ return VLC_CODEC_RGB15;
break;
case 8:
if (f->depth == 8)
- return VLC_FOURCC ('R', 'G', 'B', '2');
+ return VLC_CODEC_RGB8;
break;
}
break;
}
- msg_Err (vout, "unknown XVideo RGB format %"PRIx32" (%.4s)",
+ msg_Err (vd, "unknown XVideo RGB format %"PRIx32" (%.4s)",
f->id, f->guid);
- msg_Dbg (vout, " %"PRIu8" planes, %"PRIu8" bits/pixel, "
+ msg_Dbg (vd, " %"PRIu8" planes, %"PRIu8" bits/pixel, "
"depth %"PRIu8, f->num_planes, f->bpp, f->depth);
break;
{
/*untested: case 24:
if (f->vhorz_u_period == 1 && f->vvert_u_period == 1)
- return VLC_FOURCC ('I', '4', '4', '4');
+ return VLC_CODEC_I444;
break;*/
case 16:
if (f->vhorz_u_period == 2 && f->vvert_u_period == 1)
{
if (!strcmp ((const char *)f->vcomp_order, "YUYV"))
- return VLC_FOURCC ('Y', 'U', 'Y', '2');
+ return VLC_CODEC_YUYV;
if (!strcmp ((const char *)f->vcomp_order, "UYVY"))
- return VLC_FOURCC ('U', 'Y', 'V', 'Y');
+ return VLC_CODEC_UYVY;
}
break;
}
if (f->vhorz_u_period == 2 && f->vvert_u_period == 2)
{
if (!strcmp ((const char *)f->vcomp_order, "YVU"))
- return VLC_FOURCC ('Y', 'V', '1', '2');
+ return VLC_CODEC_YV12;
if (!strcmp ((const char *)f->vcomp_order, "YUV"))
- return VLC_FOURCC ('I', '4', '2', '0');
+ return VLC_CODEC_I420;
}
}
break;
}
bad:
- msg_Err (vout, "unknown XVideo YUV format %"PRIx32" (%.4s)", f->id,
+ msg_Err (vd, "unknown XVideo YUV format %"PRIx32" (%.4s)", f->id,
f->guid);
- msg_Dbg (vout, " %"PRIu8" planes, %"PRIu32" bits/pixel, "
+ msg_Dbg (vd, " %"PRIu8" planes, %"PRIu32" bits/pixel, "
"%"PRIu32"/%"PRIu32"/%"PRIu32" bits/sample", f->num_planes,
f->bpp, f->y_sample_bits, f->u_sample_bits, f->v_sample_bits);
- msg_Dbg (vout, " period: %"PRIu32"/%"PRIu32"/%"PRIu32"x"
+ msg_Dbg (vd, " period: %"PRIu32"/%"PRIu32"/%"PRIu32"x"
"%"PRIu32"/%"PRIu32"/%"PRIu32,
f->vhorz_y_period, f->vhorz_u_period, f->vhorz_v_period,
f->vvert_y_period, f->vvert_u_period, f->vvert_v_period);
- msg_Warn (vout, " order: %.32s", f->vcomp_order);
+ msg_Warn (vd, " order: %.32s", f->vcomp_order);
break;
}
return 0;
static const xcb_xv_image_format_info_t *
-FindFormat (vout_thread_t *vout, vlc_fourcc_t chroma, xcb_xv_port_t port,
+FindFormat (vout_display_t *vd,
+ vlc_fourcc_t chroma, const video_format_t *fmt,
+ xcb_xv_port_t port,
const xcb_xv_list_image_formats_reply_t *list,
xcb_xv_query_image_attributes_reply_t **restrict pa)
{
- xcb_connection_t *conn = vout->p_sys->conn;
+ xcb_connection_t *conn = vd->sys->conn;
const xcb_xv_image_format_info_t *f, *end;
+#ifndef XCB_XV_OLD
f = xcb_xv_list_image_formats_format (list);
+#else
+ f = (xcb_xv_image_format_info_t *) (list + 1);
+#endif
end = f + xcb_xv_list_image_formats_format_length (list);
for (; f < end; f++)
{
- if (chroma != ParseFormat (vout, f))
+ if (chroma != ParseFormat (vd, f))
continue;
+ /* VLC pads scanline to 16 pixels internally */
+ unsigned width = (fmt->i_width + 15) & ~15;
+ unsigned height = (fmt->i_height + 15) & ~15;
xcb_xv_query_image_attributes_reply_t *i;
i = xcb_xv_query_image_attributes_reply (conn,
xcb_xv_query_image_attributes (conn, port, f->id,
- vout->fmt_in.i_width, vout->fmt_in.i_height), NULL);
+ width, height), NULL);
if (i == NULL)
continue;
- if (i->width != vout->fmt_in.i_width
- || i->height != vout->fmt_in.i_height)
+ if (i->width != width || i->height != height)
{
- msg_Warn (vout, "incompatible size %ux%u -> %"PRIu32"x%"PRIu32,
- vout->fmt_in.i_width, vout->fmt_in.i_height,
+ msg_Warn (vd, "incompatible size %ux%u -> %"PRIu32"x%"PRIu32,
+ fmt->i_width, fmt->i_height,
i->width, i->height);
+ var_Create (vd->p_libvlc, "xvideo-resolution-error", VLC_VAR_BOOL);
+ if (!var_GetBool (vd->p_libvlc, "xvideo-resolution-error"))
+ {
+ dialog_FatalWait (vd, _("Video acceleration not available"),
+ _("Your video output acceleration driver does not support "
+ "the required resolution: %ux%u pixels. The maximum "
+ "supported resolution is %"PRIu32"x%"PRIu32".\n"
+ "Video output acceleration will be disabled. However, "
+ "rendering videos with overly large resolution "
+ "may cause severe performance degration."),
+ width, height, i->width, i->height);
+ var_SetBool (vd->p_libvlc, "xvideo-resolution-error", true);
+ }
free (i);
continue;
}
return NULL;
}
+
/**
- * Allocate drawable window and picture buffers.
+ * Probe the X server.
*/
-static int Init (vout_thread_t *vout)
+static int Open (vlc_object_t *obj)
{
- vout_sys_t *p_sys = vout->p_sys;
- xcb_xv_query_image_attributes_reply_t *att;
+ vout_display_t *vd = (vout_display_t *)obj;
+ vout_display_sys_t *p_sys = malloc (sizeof (*p_sys));
+
+ if (!var_InheritBool (obj, "overlay"))
+ return VLC_EGENERIC;
+ if (p_sys == NULL)
+ return VLC_ENOMEM;
+
+ vd->sys = p_sys;
+
+ /* Connect to X */
+ xcb_connection_t *conn;
+ const xcb_screen_t *screen;
+ uint8_t depth;
+ p_sys->embed = GetWindow (vd, &conn, &screen, &depth);
+ if (p_sys->embed == NULL)
+ {
+ free (p_sys);
+ return VLC_EGENERIC;
+ }
+
+ p_sys->conn = conn;
+ p_sys->att = NULL;
+ p_sys->pool = NULL;
+ p_sys->swap_uv = false;
+
+ if (!CheckXVideo (vd, conn))
+ {
+ msg_Warn (vd, "Please enable XVideo 2.2 for faster video display");
+ goto error;
+ }
+
+ p_sys->window = xcb_generate_id (conn);
+ xcb_pixmap_t pixmap = xcb_generate_id (conn);
+
+ /* Cache adaptors infos */
+ xcb_xv_query_adaptors_reply_t *adaptors =
+ xcb_xv_query_adaptors_reply (conn,
+ xcb_xv_query_adaptors (conn, p_sys->embed->handle.xid), NULL);
+ if (adaptors == NULL)
+ goto error;
+
+ int forced_adaptor = var_InheritInteger (obj, "xvideo-adaptor");
+
+ /* */
+ video_format_t fmt = vd->fmt;
+ p_sys->port = 0;
- /* FIXME: check max image size */
xcb_xv_adaptor_info_iterator_t it;
- for (it = xcb_xv_query_adaptors_info_iterator (p_sys->adaptors);
+ for (it = xcb_xv_query_adaptors_info_iterator (adaptors);
it.rem > 0;
xcb_xv_adaptor_info_next (&it))
{
const xcb_xv_adaptor_info_t *a = it.data;
+ char *name;
+
+ if (forced_adaptor != -1 && forced_adaptor != 0)
+ {
+ forced_adaptor--;
+ continue;
+ }
- /* FIXME: Open() should fail if none of the ports are usable to VLC */
if (!(a->type & XCB_XV_TYPE_IMAGE_MASK))
continue;
- xcb_xv_list_image_formats_reply_t *r;
- r = xcb_xv_list_image_formats_reply (p_sys->conn,
- xcb_xv_list_image_formats (p_sys->conn, a->base_id), NULL);
+ xcb_xv_list_image_formats_reply_t *r =
+ xcb_xv_list_image_formats_reply (conn,
+ xcb_xv_list_image_formats (conn, a->base_id), NULL);
if (r == NULL)
continue;
- const xcb_xv_image_format_info_t *fmt;
-
- /* Video chroma in preference order */
- const vlc_fourcc_t chromas[] = {
- vout->fmt_in.i_chroma,
- VLC_FOURCC ('Y', 'U', 'Y', '2'),
- VLC_FOURCC ('R', 'V', '2', '4'),
- VLC_FOURCC ('R', 'V', '1', '5'),
+ /* Look for an image format */
+ const xcb_xv_image_format_info_t *xfmt = NULL;
+ const vlc_fourcc_t *chromas, chromas_default[] = {
+ fmt.i_chroma,
+ VLC_CODEC_RGB32,
+ VLC_CODEC_RGB24,
+ VLC_CODEC_RGB16,
+ VLC_CODEC_RGB15,
+ VLC_CODEC_YUYV,
+ 0
};
- for (size_t i = 0; i < sizeof (chromas) / sizeof (chromas[0]); i++)
+ if (vlc_fourcc_IsYUV (fmt.i_chroma))
+ chromas = vlc_fourcc_GetYUVFallback (fmt.i_chroma);
+ else
+ chromas = chromas_default;
+
+ vlc_fourcc_t chroma;
+ for (size_t i = 0; chromas[i]; i++)
{
- vlc_fourcc_t chroma = chromas[i];
- fmt = FindFormat (vout, chroma, a->base_id, r, &att);
- if (fmt != NULL)
+ chroma = chromas[i];
+
+ /* Oink oink! */
+ if ((chroma == VLC_CODEC_I420 || chroma == VLC_CODEC_YV12)
+ && a->name_size >= 4
+ && !memcmp ("OMAP", xcb_xv_adaptor_info_name (a), 4))
+ {
+ msg_Dbg (vd, "skipping slow I420 format");
+ continue; /* OMAP framebuffer sucks at YUV 4:2:0 */
+ }
+
+ xfmt = FindFormat (vd, chroma, &fmt, a->base_id, r, &p_sys->att);
+ if (xfmt != NULL)
{
- vout->output.i_chroma = chroma;
- goto found_format;
+ p_sys->id = xfmt->id;
+ p_sys->swap_uv = vlc_fourcc_AreUVPlanesSwapped (fmt.i_chroma,
+ chroma);
+ if (!p_sys->swap_uv)
+ fmt.i_chroma = chroma;
+ if (xfmt->type == XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB)
+ {
+ fmt.i_rmask = xfmt->red_mask;
+ fmt.i_gmask = xfmt->green_mask;
+ fmt.i_bmask = xfmt->blue_mask;
+ }
+ break;
}
}
free (r);
- continue;
+ if (xfmt == NULL) /* No acceptable image formats */
+ continue;
- found_format:
- /* TODO: grab port */
- p_sys->port = a->base_id;
- msg_Dbg (vout, "using port %"PRIu32, p_sys->port);
+ /* Grab a port */
+ for (unsigned i = 0; i < a->num_ports; i++)
+ {
+ xcb_xv_port_t port = a->base_id + i;
+ xcb_xv_grab_port_reply_t *gr =
+ xcb_xv_grab_port_reply (conn,
+ xcb_xv_grab_port (conn, port, XCB_CURRENT_TIME), NULL);
+ uint8_t result = gr ? gr->result : 0xff;
+
+ free (gr);
+ if (result == 0)
+ {
+ p_sys->port = port;
+ goto grabbed_port;
+ }
+ msg_Dbg (vd, "cannot grab port %"PRIu32": Xv error %"PRIu8, port,
+ result);
+ }
+ continue; /* No usable port */
- p_sys->id = fmt->id;
- msg_Dbg (vout, "using image format 0x%"PRIx32, p_sys->id);
- if (fmt->type == XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB)
+ grabbed_port:
+ /* Found port - initialize selected format */
+ name = strndup (xcb_xv_adaptor_info_name (a), a->name_size);
+ if (name != NULL)
{
- vout->fmt_out.i_rmask = vout->output.i_rmask = fmt->red_mask;
- vout->fmt_out.i_gmask = vout->output.i_gmask = fmt->green_mask;
- vout->fmt_out.i_bmask = vout->output.i_bmask = fmt->blue_mask;
+ msg_Dbg (vd, "using adaptor %s", name);
+ free (name);
}
- free (r);
- goto found_adaptor;
- }
- msg_Err (vout, "no available XVideo adaptor");
- return VLC_EGENERIC; /* no usable adaptor */
+ msg_Dbg (vd, "using port %"PRIu32, p_sys->port);
+ msg_Dbg (vd, "using image format 0x%"PRIx32, p_sys->id);
- /* Allocate picture buffers */
- const uint32_t *offsets;
-found_adaptor:
- offsets = xcb_xv_query_image_attributes_offsets (att);
+ /* Look for an X11 visual, create a window */
+ xcb_xv_format_t *f = xcb_xv_adaptor_info_formats (a);
+ for (uint_fast16_t i = a->num_formats; i > 0; i--, f++)
+ {
+ if (f->depth != screen->root_depth)
+ continue; /* this would fail anyway */
+
+ uint32_t mask =
+ XCB_CW_BACK_PIXMAP |
+ XCB_CW_BACK_PIXEL |
+ XCB_CW_BORDER_PIXMAP |
+ XCB_CW_BORDER_PIXEL |
+ XCB_CW_EVENT_MASK |
+ XCB_CW_COLORMAP;
+ const uint32_t list[] = {
+ /* XCB_CW_BACK_PIXMAP */
+ pixmap,
+ /* XCB_CW_BACK_PIXEL */
+ screen->black_pixel,
+ /* XCB_CW_BORDER_PIXMAP */
+ pixmap,
+ /* XCB_CW_BORDER_PIXEL */
+ screen->black_pixel,
+ /* XCB_CW_EVENT_MASK */
+ XCB_EVENT_MASK_VISIBILITY_CHANGE,
+ /* XCB_CW_COLORMAP */
+ screen->default_colormap,
+ };
+
+ xcb_void_cookie_t c;
+
+ xcb_create_pixmap (conn, f->depth, pixmap, screen->root, 1, 1);
+ c = xcb_create_window_checked (conn, f->depth, p_sys->window,
+ p_sys->embed->handle.xid, 0, 0, 1, 1, 0,
+ XCB_WINDOW_CLASS_INPUT_OUTPUT, f->visual, mask, list);
+
+ if (!CheckError (vd, conn, "cannot create X11 window", c))
+ {
+ msg_Dbg (vd, "using X11 visual ID 0x%"PRIx32
+ " (depth: %"PRIu8")", f->visual, f->depth);
+ msg_Dbg (vd, "using X11 window 0x%08"PRIx32, p_sys->window);
+ goto created_window;
+ }
+ }
+ xcb_xv_ungrab_port (conn, p_sys->port, XCB_CURRENT_TIME);
+ p_sys->port = 0;
+ msg_Dbg (vd, "no usable X11 visual");
+ continue; /* No workable XVideo format (visual/depth) */
- I_OUTPUTPICTURES = 0;
- for (size_t index = 0; I_OUTPUTPICTURES < 2; index++)
+ created_window:
+ break;
+ }
+ free (adaptors);
+ if (!p_sys->port)
{
- picture_t *pic = vout->p_picture + index;
-
- if (index > sizeof (vout->p_picture) / sizeof (pic))
- break;
- if (pic->i_status != FREE_PICTURE)
- continue;
-
- vout_InitPicture (vout, pic, vout->output.i_chroma,
- att->width, att->height,
- vout->fmt_in.i_aspect);
- if (PictureAlloc (vout, pic, att->data_size,
- p_sys->shm ? p_sys->conn : NULL))
- break;
- /* Allocate further planes as specified by XVideo */
- /* We assume that offsets[0] is zero */
- for (int i = 1; i < pic->i_planes; i++)
- pic->p[i].p_pixels = pic->p->p_pixels + offsets[i];
- PP_OUTPUTPICTURE[I_OUTPUTPICTURES++] = pic;
+ msg_Err (vd, "no available XVideo adaptor");
+ goto error;
}
- free (att);
+ else
+ {
+ xcb_map_window (conn, p_sys->window);
+
+ vout_display_place_t place;
+
+ vout_display_PlacePicture (&place, &vd->source, vd->cfg, false);
+ p_sys->width = place.width;
+ p_sys->height = place.height;
+
+ /* */
+ const uint32_t values[] = {
+ place.x, place.y, place.width, place.height };
+ xcb_configure_window (conn, p_sys->window,
+ XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
+ XCB_CONFIG_WINDOW_WIDTH |
+ XCB_CONFIG_WINDOW_HEIGHT,
+ values);
+ }
+ p_sys->visible = false;
+
+ /* Create graphic context */
+ p_sys->gc = xcb_generate_id (conn);
+ xcb_create_gc (conn, p_sys->gc, p_sys->window, 0, NULL);
+ msg_Dbg (vd, "using X11 graphic context 0x%08"PRIx32, p_sys->gc);
+
+ /* Create cursor */
+ p_sys->cursor = CreateBlankCursor (conn, screen);
+
+ CheckSHM (obj, conn, &p_sys->shm);
+
+ /* */
+ vout_display_info_t info = vd->info;
+ info.has_pictures_invalid = false;
+ info.has_event_thread = true;
+
+ /* Setup vout_display_t once everything is fine */
+ vd->fmt = fmt;
+ vd->info = info;
+
+ vd->pool = Pool;
+ vd->prepare = NULL;
+ vd->display = Display;
+ vd->control = Control;
+ vd->manage = Manage;
+
+ /* */
+ bool is_fullscreen = vd->cfg->is_fullscreen;
+ if (is_fullscreen && vout_window_SetFullScreen (p_sys->embed, true))
+ is_fullscreen = false;
+ vout_display_SendEventFullscreen (vd, is_fullscreen);
+ unsigned width, height;
+ if (!GetWindowSize (p_sys->embed, conn, &width, &height))
+ vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen);
- unsigned x, y, width, height;
+ return VLC_SUCCESS;
- if (GetWindowSize (p_sys->embed, p_sys->conn, &width, &height))
- return VLC_EGENERIC;
- vout_PlacePicture (vout, width, height, &x, &y, &width, &height);
+error:
+ Close (obj);
+ return VLC_EGENERIC;
+}
- const uint32_t values[] = { x, y, width, height, };
- xcb_configure_window (p_sys->conn, p_sys->window,
- XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
- XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
- values);
- xcb_flush (p_sys->conn);
- p_sys->height = height;
- p_sys->width = width;
- vout->fmt_out.i_chroma = vout->output.i_chroma;
- vout->fmt_out.i_visible_width = vout->fmt_in.i_visible_width;
- vout->fmt_out.i_visible_height = vout->fmt_in.i_visible_height;
- vout->fmt_out.i_sar_num = vout->fmt_out.i_sar_den = 1;
+/**
+ * Disconnect from the X server.
+ */
+static void Close (vlc_object_t *obj)
+{
+ vout_display_t *vd = (vout_display_t *)obj;
+ vout_display_sys_t *p_sys = vd->sys;
- vout->output.i_width = vout->fmt_out.i_width = vout->fmt_in.i_width;
- vout->output.i_height = vout->fmt_out.i_height = vout->fmt_in.i_height;
- vout->fmt_out.i_x_offset = vout->fmt_in.i_x_offset;
- p_vout->fmt_out.i_y_offset = vout->fmt_in.i_y_offset;
+ if (p_sys->pool)
+ {
+ for (unsigned i = 0; i < MAX_PICTURES; i++)
+ {
+ picture_resource_t *res = &p_sys->resource[i];
- assert (height > 0);
- vout->output.i_aspect = vout->fmt_out.i_aspect =
- width * VOUT_ASPECT_FACTOR / height;
+ if (!res->p->p_pixels)
+ break;
+ PictureResourceFree (res, NULL);
+ }
+ picture_pool_Delete (p_sys->pool);
+ }
- return VLC_SUCCESS;
+ /* show the default cursor */
+ xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid, XCB_CW_CURSOR,
+ &(uint32_t) { XCB_CURSOR_NONE });
+ xcb_flush (p_sys->conn);
+
+ free (p_sys->att);
+ xcb_disconnect (p_sys->conn);
+ vout_display_DeleteWindow (vd, p_sys->embed);
+ free (p_sys);
}
/**
- * Free picture buffers.
+ * Return a direct buffer
*/
-static void Deinit (vout_thread_t *vout)
+static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count)
{
- vout_sys_t *p_sys = vout->p_sys;
+ vout_display_sys_t *p_sys = vd->sys;
+
+ if (!p_sys->pool)
+ {
+ memset (p_sys->resource, 0, sizeof(p_sys->resource));
+
+ const uint32_t *pitches =
+ xcb_xv_query_image_attributes_pitches (p_sys->att);
+ const uint32_t *offsets =
+ xcb_xv_query_image_attributes_offsets (p_sys->att);
+ p_sys->data_size = p_sys->att->data_size;
+
+ unsigned count;
+ picture_t *pic_array[MAX_PICTURES];
+ for (count = 0; count < requested_count; count++)
+ {
+ if (count >= MAX_PICTURES)
+ break;
+ picture_resource_t *res = &p_sys->resource[count];
+
+ for (int i = 0; i < __MIN (p_sys->att->num_planes, PICTURE_PLANE_MAX); i++)
+ {
+ res->p[i].i_lines =
+ ((i + 1 < p_sys->att->num_planes ? offsets[i+1] :
+ p_sys->data_size) - offsets[i]) / pitches[i];
+ res->p[i].i_pitch = pitches[i];
+ }
+ if (PictureResourceAlloc (vd, res, p_sys->att->data_size,
+ p_sys->conn, p_sys->shm))
+ break;
+
+ /* Allocate further planes as specified by XVideo */
+ /* We assume that offsets[0] is zero */
+ for (int i = 1; i < __MIN (p_sys->att->num_planes, PICTURE_PLANE_MAX); i++)
+ res->p[i].p_pixels = res->p[0].p_pixels + offsets[i];
+ if (p_sys->swap_uv)
+ { /* YVU: swap U and V planes */
+ uint8_t *buf = res->p[2].p_pixels;
+ res->p[2].p_pixels = res->p[1].p_pixels;
+ res->p[1].p_pixels = buf;
+ }
+
+ pic_array[count] = picture_NewFromResource (&vd->fmt, res);
+ if (!pic_array[count])
+ {
+ PictureResourceFree (res, p_sys->conn);
+ memset (res, 0, sizeof(*res));
+ break;
+ }
+ }
+
+ if (count == 0)
+ return NULL;
- for (int i = 0; i < I_OUTPUTPICTURES; i++)
- PictureFree (PP_OUTPUTPICTURE[i], p_sys->conn);
+ p_sys->pool = picture_pool_New (count, pic_array);
+ /* TODO release picture resources if NULL */
+ xcb_flush (p_sys->conn);
+ }
+
+ return p_sys->pool;
}
/**
* Sends an image to the X server.
*/
-static void Display (vout_thread_t *vout, picture_t *pic)
+static void Display (vout_display_t *vd, picture_t *pic)
{
- vout_sys_t *p_sys = vout->p_sys;
- xcb_shm_seg_t segment = (uintptr_t)pic->p_sys;
+ vout_display_sys_t *p_sys = vd->sys;
+ xcb_shm_seg_t segment = pic->p_sys->segment;
+ xcb_void_cookie_t ck;
+ if (!p_sys->visible)
+ goto out;
if (segment)
- xcb_xv_shm_put_image (p_sys->conn, p_sys->port, p_sys->window,
- p_sys->gc, segment, p_sys->id, 0,
- /* Src: */ 0, 0,
- pic->p->i_visible_pitch / pic->p->i_pixel_pitch,
- pic->p->i_visible_lines,
- /* Dst: */ 0, 0, p_sys->width, p_sys->height,
- /* Memory: */
- pic->p->i_pitch / pic->p->i_pixel_pitch,
+ ck = xcb_xv_shm_put_image_checked (p_sys->conn, p_sys->port,
+ p_sys->window, p_sys->gc, segment, p_sys->id, 0,
+ /* Src: */ vd->source.i_x_offset,
+ vd->source.i_y_offset,
+ vd->source.i_visible_width,
+ vd->source.i_visible_height,
+ /* Dst: */ 0, 0, p_sys->width, p_sys->height,
+ /* Memory: */ pic->p->i_pitch / pic->p->i_pixel_pitch,
pic->p->i_lines, false);
else
- xcb_xv_put_image (p_sys->conn, p_sys->port, p_sys->window,
+ ck = xcb_xv_put_image_checked (p_sys->conn, p_sys->port, p_sys->window,
p_sys->gc, p_sys->id,
- 0, 0,
- pic->p->i_visible_pitch / pic->p->i_pixel_pitch,
- pic->p->i_visible_lines,
+ vd->source.i_x_offset,
+ vd->source.i_y_offset,
+ vd->source.i_visible_width,
+ vd->source.i_visible_height,
0, 0, p_sys->width, p_sys->height,
pic->p->i_pitch / pic->p->i_pixel_pitch,
pic->p->i_lines,
- pic->p->i_pitch * pic->p->i_lines, pic->p->p_pixels);
- xcb_flush (p_sys->conn);
+ p_sys->data_size, pic->p->p_pixels);
+
+ /* Wait for reply. See x11.c for rationale. */
+ xcb_generic_error_t *e = xcb_request_check (p_sys->conn, ck);
+ if (e != NULL)
+ {
+ msg_Dbg (vd, "%s: X11 error %d", "cannot put image", e->error_code);
+ free (e);
+ }
+out:
+ picture_Release (pic);
}
-/**
- * Process incoming X events.
- */
-static int Manage (vout_thread_t *vout)
+static int Control (vout_display_t *vd, int query, va_list ap)
{
- vout_sys_t *p_sys = vout->p_sys;
- xcb_generic_event_t *ev;
+ vout_display_sys_t *p_sys = vd->sys;
- while ((ev = xcb_poll_for_event (p_sys->conn)) != NULL)
- ProcessEvent (vout, p_sys->conn, p_sys->window, ev);
+ switch (query)
+ {
+ case VOUT_DISPLAY_CHANGE_FULLSCREEN:
+ {
+ const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *);
+ return vout_window_SetFullScreen (p_sys->embed, c->is_fullscreen);
+ }
- if (xcb_connection_has_error (p_sys->conn))
+ case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
+ case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
+ case VOUT_DISPLAY_CHANGE_ZOOM:
+ case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
+ case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
{
- msg_Err (vout, "X server failure");
+ const vout_display_cfg_t *cfg;
+ const video_format_t *source;
+ bool is_forced = false;
+
+ if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
+ || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
+ {
+ source = (const video_format_t *)va_arg (ap, const video_format_t *);
+ cfg = vd->cfg;
+ }
+ else
+ {
+ source = &vd->source;
+ cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
+ if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
+ is_forced = (bool)va_arg (ap, int);
+ }
+
+ /* */
+ if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
+ && is_forced
+ && (cfg->display.width != vd->cfg->display.width
+ ||cfg->display.height != vd->cfg->display.height)
+ && vout_window_SetSize (p_sys->embed,
+ cfg->display.width,
+ cfg->display.height))
+ return VLC_EGENERIC;
+
+ vout_display_place_t place;
+ vout_display_PlacePicture (&place, source, cfg, false);
+ p_sys->width = place.width;
+ p_sys->height = place.height;
+
+ /* Move the picture within the window */
+ const uint32_t values[] = { place.x, place.y,
+ place.width, place.height, };
+ xcb_configure_window (p_sys->conn, p_sys->window,
+ XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
+ | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
+ values);
+ xcb_flush (p_sys->conn);
+ return VLC_SUCCESS;
+ }
+ case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
+ {
+ unsigned state = va_arg (ap, unsigned);
+ return vout_window_SetState (p_sys->embed, state);
+ }
+
+ /* Hide the mouse. It will be send when
+ * vout_display_t::info.b_hide_mouse is false */
+ case VOUT_DISPLAY_HIDE_MOUSE:
+ xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid,
+ XCB_CW_CURSOR, &(uint32_t){ p_sys->cursor });
+ return VLC_SUCCESS;
+ case VOUT_DISPLAY_RESET_PICTURES:
+ assert(0);
+ default:
+ msg_Err (vd, "Unknown request in XCB vout display");
return VLC_EGENERIC;
}
- return VLC_SUCCESS;
}
-void
-HandleParentStructure (vout_thread_t *vout, xcb_connection_t *conn,
- xcb_window_t xid, xcb_configure_notify_event_t *ev)
+static void Manage (vout_display_t *vd)
{
- unsigned width, height, x, y;
-
- vout_PlacePicture (vout, ev->width, ev->height, &x, &y, &width, &height);
-
- /* Move the picture within the window */
- const uint32_t values[] = { x, y, width, height, };
- xcb_configure_window (conn, xid,
- XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
- | XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
- values);
- vout->p_sys->width = width;
- vout->p_sys->height = height;
+ vout_display_sys_t *p_sys = vd->sys;
+
+ ManageEvent (vd, p_sys->conn, &p_sys->visible);
}
+
projects / vlc / blobdiff