X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_output%2Fxcb%2Fxvideo.c;h=397f3b2d5f5f18d98f520b3b0ae0f7545991a9e5;hb=cb27ef344a0a61f36d7cc129e7e32226be144d9e;hp=680242cec7401af58d613ced47138326946a1dee;hpb=495aedb975d3737e61f7992fc6b9421205a0fee8;p=vlc diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index 680242cec7..397f3b2d5f 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -7,7 +7,7 @@ * * 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, @@ -15,7 +15,7 @@ * 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 ****************************************************************************/ @@ -25,6 +25,7 @@ #endif #include +#include #include #include @@ -35,22 +36,19 @@ #include #include #include +#include #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_( \ - "Use shared memory to communicate between VLC and the X server.") +#define FORMAT_TEXT N_("XVideo format id") +#define FORMAT_LONGTEXT N_( \ + "XVideo image format id to use. By default, VLC will " \ + "try to use the best match for the video being played.") static int Open (vlc_object_t *); static void Close (vlc_object_t *); @@ -63,28 +61,25 @@ vlc_module_begin () set_description (N_("XVideo output (XCB)")) set_category (CAT_VIDEO) set_subcategory (SUBCAT_VIDEO_VOUT) - set_capability ("vout display", 155) + set_capability ("vout display", 200) set_callbacks (Open, Close) - add_string ("x11-display", NULL, NULL, - DISPLAY_TEXT, DISPLAY_LONGTEXT, true) - add_deprecated_alias ("xvideo-display") - add_integer ("xvideo-adaptor", -1, NULL, + add_integer ("xvideo-adaptor", -1, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true) - add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true) - add_deprecated_alias ("xvideo-shm") - add_shortcut ("xcb-xv") - add_shortcut ("xv") - add_shortcut ("xvideo") + add_integer ("xvideo-format-id", 0, + FORMAT_TEXT, FORMAT_LONGTEXT, true) + add_obsolete_bool ("xvideo-shm") /* removed in 1.2.0 */ + add_shortcut ("xcb-xv", "xv", "xvideo", "xid") vlc_module_end () -#define MAX_PICTURES (VOUT_MAX_PICTURES) +#define MAX_PICTURES (128) struct vout_display_sys_t { xcb_connection_t *conn; 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 */ @@ -92,15 +87,17 @@ struct vout_display_sys_t 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 picture_t *Get (vout_display_t *); -static void Display (vout_display_t *, picture_t *); +static picture_pool_t *Pool (vout_display_t *, unsigned); +static void Display (vout_display_t *, picture_t *, subpicture_t *subpicture); static int Control (vout_display_t *, int, va_list); static void Manage (vout_display_t *); @@ -113,63 +110,76 @@ static bool CheckXVideo (vout_display_t *vd, xcb_connection_t *conn) 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 (vd, "using XVideo extension v%"PRIu8".%"PRIu8, - r->major, r->minor); - ok = true; - } - else - msg_Dbg (vd, "XVideo extension too old (v%"PRIu8".%"PRIu8, - r->major, r->minor); - free (r); - } - else + 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 (vd, "using XVideo extension v%"PRIu8".%"PRIu8, + r->major, r->minor); + ok = true; + } + free (r); return ok; } -static vlc_fourcc_t ParseFormat (vout_display_t *vd, +static vlc_fourcc_t ParseFormat (vlc_object_t *obj, const xcb_xv_image_format_info_t *restrict f) { - if (f->byte_order != ORDER && f->bpp != 8) - return 0; /* Argh! */ - switch (f->type) { case XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB: switch (f->num_planes) { case 1: - switch (f->bpp) + switch (popcount (f->red_mask | f->green_mask | f->blue_mask)) { - case 32: - if (f->depth == 24) - return VLC_CODEC_RGB32; - break; case 24: - if (f->depth == 24) + if (f->bpp == 32 && f->depth == 32) + return VLC_CODEC_RGBA; + if (f->bpp == 32 && f->depth == 24) + return VLC_CODEC_RGB32; + if (f->bpp == 24 && f->depth == 24) return VLC_CODEC_RGB24; break; case 16: - if (f->depth == 16) + if (f->byte_order != ORDER) + return 0; /* Mixed endian! */ + if (f->bpp == 16 && f->depth == 16) return VLC_CODEC_RGB16; - if (f->depth == 15) + break; + case 15: + if (f->byte_order != ORDER) + return 0; /* Mixed endian! */ + if (f->bpp == 16 && f->depth == 16) + return VLC_CODEC_RGBT; + if (f->bpp == 16 && f->depth == 15) return VLC_CODEC_RGB15; break; + case 12: + if (f->bpp == 16 && f->depth == 16) + return VLC_CODEC_RGBA16; + if (f->bpp == 16 && f->depth == 12) + return VLC_CODEC_RGB12; case 8: - if (f->depth == 8) + if (f->bpp == 8 && f->depth == 8) return VLC_CODEC_RGB8; break; } break; } - msg_Err (vd, "unknown XVideo RGB format %"PRIx32" (%.4s)", + msg_Err (obj, "unknown XVideo RGB format %"PRIx32" (%.4s)", f->id, f->guid); - msg_Dbg (vd, " %"PRIu8" planes, %"PRIu8" bits/pixel, " + msg_Dbg (obj, " %"PRIu8" planes, %"PRIu8" bits/pixel, " "depth %"PRIu8, f->num_planes, f->bpp, f->depth); break; @@ -215,63 +225,144 @@ static vlc_fourcc_t ParseFormat (vout_display_t *vd, break; } bad: - msg_Err (vd, "unknown XVideo YUV format %"PRIx32" (%.4s)", f->id, + msg_Err (obj, "unknown XVideo YUV format %"PRIx32" (%.4s)", f->id, f->guid); - msg_Dbg (vd, " %"PRIu8" planes, %"PRIu32" bits/pixel, " + msg_Dbg (obj, " %"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 (vd, " period: %"PRIu32"/%"PRIu32"/%"PRIu32"x" + msg_Dbg (obj, " 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 (vd, " order: %.32s", f->vcomp_order); + msg_Warn (obj, " order: %.32s", f->vcomp_order); break; } return 0; } +static bool BetterFormat (vlc_fourcc_t a, const vlc_fourcc_t *tab, + unsigned *rankp) +{ + for (unsigned i = 0, max = *rankp; i < max && tab[i] != 0; i++) + if (tab[i] == a) + { + *rankp = i; + return true; + } + return false; +} -static const xcb_xv_image_format_info_t * -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) +static xcb_xv_query_image_attributes_reply_t * +FindFormat (vlc_object_t *obj, xcb_connection_t *conn, video_format_t *fmt, + const xcb_xv_adaptor_info_t *a, uint32_t *idp) { - xcb_connection_t *conn = vd->sys->conn; - const xcb_xv_image_format_info_t *f, *end; + /* Order chromas by preference */ + vlc_fourcc_t tab[7]; + const vlc_fourcc_t *chromav = tab; -#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++) + vlc_fourcc_t chroma = var_InheritInteger (obj, "xvideo-format-id"); + if (chroma != 0) /* Forced chroma */ + { + tab[0] = chroma; + tab[1] = 0; + } + else if (vlc_fourcc_IsYUV (fmt->i_chroma)) /* YUV chroma */ + { + chromav = vlc_fourcc_GetYUVFallback (fmt->i_chroma); + } + else /* RGB chroma */ + { + tab[0] = fmt->i_chroma; + tab[1] = VLC_CODEC_RGB32; + tab[2] = VLC_CODEC_RGB24; + tab[3] = VLC_CODEC_RGB16; + tab[4] = VLC_CODEC_RGB15; + tab[5] = VLC_CODEC_YUYV; + tab[6] = 0; + } + + /* Get available image formats */ + xcb_xv_list_image_formats_reply_t *list = + xcb_xv_list_image_formats_reply (conn, + xcb_xv_list_image_formats (conn, a->base_id), NULL); + if (list == NULL) + return NULL; + + /* Check available XVideo chromas */ + xcb_xv_query_image_attributes_reply_t *attr = NULL; + unsigned rank = UINT_MAX; + + for (const xcb_xv_image_format_info_t *f = + xcb_xv_list_image_formats_format (list), + *f_end = + f + xcb_xv_list_image_formats_format_length (list); + f < f_end; + f++) { - if (chroma != ParseFormat (vd, f)) + chroma = ParseFormat (obj, f); + if (chroma == 0) continue; + /* 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 (obj, "skipping slow I420 format"); + continue; /* OMAP framebuffer sucks at YUV 4:2:0 */ + } + + if (!BetterFormat (chroma, chromav, &rank)) + continue; + + /* VLC pads scanline to 16 pixels internally */ + unsigned width = fmt->i_width; + unsigned height = fmt->i_height; 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, - fmt->i_width, fmt->i_height), NULL); + xcb_xv_query_image_attributes (conn, a->base_id, f->id, + width, height), NULL); if (i == NULL) continue; - if (i->width != fmt->i_width - || i->height != fmt->i_height) + if (i->width != width || i->height != height) { - msg_Warn (vd, "incompatible size %ux%u -> %"PRIu32"x%"PRIu32, + msg_Warn (obj, "incompatible size %ux%u -> %"PRIu32"x%"PRIu32, fmt->i_width, fmt->i_height, i->width, i->height); + var_Create (obj->p_libvlc, "xvideo-res-error", VLC_VAR_BOOL); + if (!var_GetBool (obj->p_libvlc, "xvideo-res-error")) + { + dialog_FatalWait (obj, _("Video acceleration not available"), + _("Your video output acceleration driver does not support " + "the required resolution of %ux%u pixels. The 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 (obj->p_libvlc, "xvideo-res-error", true); + } free (i); continue; } - *pa = i; - return f; + + fmt->i_chroma = chroma; + if (f->type == XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB) + { + fmt->i_rmask = f->red_mask; + fmt->i_gmask = f->green_mask; + fmt->i_bmask = f->blue_mask; + } + *idp = f->id; + free (attr); + attr = i; + if (rank == 0) + break; /* shortcut for perfect match */ } - return NULL; + + free (list); + return attr; } @@ -281,41 +372,39 @@ FindFormat (vout_display_t *vd, static int Open (vlc_object_t *obj) { vout_display_t *vd = (vout_display_t *)obj; - vout_display_sys_t *p_sys = malloc (sizeof (*p_sys)); + vout_display_sys_t *p_sys; + + if (!var_InheritBool (obj, "overlay")) + return VLC_EGENERIC; + p_sys = malloc (sizeof (*p_sys)); if (p_sys == NULL) return VLC_ENOMEM; vd->sys = p_sys; /* Connect to X */ - xcb_connection_t *conn = Connect (obj); - if (conn == NULL) + 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; if (!CheckXVideo (vd, conn)) { msg_Warn (vd, "Please enable XVideo 2.2 for faster video display"); - xcb_disconnect (conn); - free (p_sys); - return VLC_EGENERIC; - } - - const xcb_screen_t *screen; - p_sys->embed = GetWindow (vd, conn, &screen, &p_sys->shm); - if (p_sys->embed == NULL) - { - xcb_disconnect (conn); - free (p_sys); - return VLC_EGENERIC; + goto error; } - /* */ - p_sys->att = NULL; - p_sys->pool = NULL; + 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 = @@ -324,19 +413,19 @@ static int Open (vlc_object_t *obj) if (adaptors == NULL) goto error; - int forced_adaptor = var_CreateGetInteger (obj, "xvideo-adaptor"); + int forced_adaptor = var_InheritInteger (obj, "xvideo-adaptor"); /* */ - video_format_t fmt = vd->fmt; - bool found_adaptor = false; + video_format_t 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 (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) { @@ -344,48 +433,18 @@ static int Open (vlc_object_t *obj) continue; } - if (!(a->type & XCB_XV_TYPE_IMAGE_MASK)) + if (!(a->type & XCB_XV_TYPE_INPUT_MASK) + || !(a->type & XCB_XV_TYPE_IMAGE_MASK)) continue; - 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) + /* Look for an image format */ + fmt = vd->fmt; + free (p_sys->att); + p_sys->att = FindFormat (obj, conn, &fmt, a, &p_sys->id); + if (p_sys->att == NULL) /* No acceptable image formats */ continue; - const xcb_xv_image_format_info_t *xfmt; - - /* */ - 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 - }; - if (vlc_fourcc_IsYUV (fmt.i_chroma)) - chromas = vlc_fourcc_GetYUVFallback (fmt.i_chroma); - else - chromas = chromas_default; - - for (size_t i = 0; chromas[i]; i++) - { - vlc_fourcc_t chroma = chromas[i]; - xfmt = FindFormat (vd, chroma, &fmt, a->base_id, r, &p_sys->att); - if (xfmt != NULL) - { - fmt.i_chroma = chroma; - goto found_format; - } - } - free (r); - continue; - - found_format: /* Grab a port */ - /* XXX: assume all of an adapter's ports have the same formats */ for (unsigned i = 0; i < a->num_ports; i++) { xcb_xv_port_t port = a->base_id + i; @@ -400,51 +459,83 @@ static int Open (vlc_object_t *obj) p_sys->port = port; goto grabbed_port; } - msg_Dbg (vd, "cannot grab port %"PRIu32, port); + msg_Dbg (vd, "cannot grab port %"PRIu32": Xv error %"PRIu8, port, + result); } - continue; + continue; /* No usable port */ grabbed_port: + /* Found port - initialize selected format */ + name = strndup (xcb_xv_adaptor_info_name (a), a->name_size); + if (name != NULL) + { + msg_Dbg (vd, "using adaptor %s", name); + free (name); + } msg_Dbg (vd, "using port %"PRIu32, p_sys->port); - - p_sys->id = xfmt->id; msg_Dbg (vd, "using image format 0x%"PRIx32, p_sys->id); - if (xfmt->type == XCB_XV_IMAGE_FORMAT_INFO_TYPE_RGB) + + /* 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++) { - fmt.i_rmask = xfmt->red_mask; - fmt.i_gmask = xfmt->green_mask; - fmt.i_bmask = xfmt->blue_mask; + 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; + } } - free (r); - found_adaptor = true; + 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) */ + + created_window: break; } free (adaptors); - if (!found_adaptor) + if (!p_sys->port) { msg_Err (vd, "no available XVideo adaptor"); goto error; } - - /* Create window */ + /* Compute video (window) placement within the parent 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 (conn); - - c = xcb_create_window_checked (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 (vd, conn, "cannot create X11 window", c)) - goto error; - p_sys->window = window; - msg_Dbg (vd, "using X11 window %08"PRIx32, window); - xcb_map_window (conn, window); + xcb_map_window (conn, p_sys->window); vout_display_place_t place; @@ -453,40 +544,62 @@ static int Open (vlc_object_t *obj) p_sys->height = place.height; /* */ - const uint32_t values[] = { place.x, place.y, place.width, place.height }; - xcb_configure_window (conn, window, + 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, + 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 %08"PRIx32, p_sys->gc); + msg_Dbg (vd, "using X11 graphic context 0x%08"PRIx32, p_sys->gc); - /* */ - p_sys->pool = NULL; + /* Disable color keying if applicable */ + { + xcb_intern_atom_reply_t *r = + xcb_intern_atom_reply (conn, + xcb_intern_atom (conn, 1, 21, "XV_AUTOPAINT_COLORKEY"), NULL); + if (r != NULL && r->atom != 0) + xcb_xv_set_port_attribute(conn, p_sys->port, r->atom, 1); + } + + /* Create cursor */ + p_sys->cursor = CreateBlankCursor (conn, screen); + + p_sys->shm = CheckSHM (obj, conn); /* */ 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 */ + p_sys->swap_uv = vlc_fourcc_AreUVPlanesSwapped (fmt.i_chroma, + vd->fmt.i_chroma); + if (p_sys->swap_uv) + fmt.i_chroma = vd->fmt.i_chroma; vd->fmt = fmt; vd->info = info; - vd->get = Get; + 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); - vout_display_SendEventFullscreen (vd, false); + vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen); return VLC_SUCCESS; @@ -512,98 +625,107 @@ static void Close (vlc_object_t *obj) if (!res->p->p_pixels) break; - PictureResourceFree (res, p_sys->conn); + PictureResourceFree (res, NULL); } picture_pool_Delete (p_sys->pool); } + /* 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); - vout_display_DeleteWindow (vd, p_sys->embed); xcb_disconnect (p_sys->conn); + vout_display_DeleteWindow (vd, p_sys->embed); free (p_sys); } -/** - * Return a direct buffer - */ -static picture_t *Get (vout_display_t *vd) +static void PoolAlloc (vout_display_t *vd, unsigned requested_count) { vout_display_sys_t *p_sys = vd->sys; - if (!p_sys->pool) - { - picture_t *pic = picture_New (vd->fmt.i_chroma, - p_sys->att->width, p_sys->att->height, 0); - if (!pic) - return NULL; + memset (p_sys->resource, 0, sizeof(p_sys->resource)); - 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); + const unsigned num_planes= __MIN(p_sys->att->num_planes, PICTURE_PLANE_MAX); + p_sys->data_size = p_sys->att->data_size; - const uint32_t *offsets = - xcb_xv_query_image_attributes_offsets (p_sys->att); - p_sys->data_size = p_sys->att->data_size; + picture_t *pic_array[MAX_PICTURES]; + requested_count = __MIN(requested_count, MAX_PICTURES); - unsigned count; - picture_t *pic_array[MAX_PICTURES]; - for (count = 0; count < MAX_PICTURES; count++) + unsigned count; + for (count = 0; count < requested_count; count++) + { + picture_resource_t *res = &p_sys->resource[count]; + + for (unsigned i = 0; i < num_planes; i++) { - picture_resource_t *res = &p_sys->resource[count]; + uint32_t data_size; + data_size = (i < num_planes - 1) ? offsets[i+1] : p_sys->data_size; - for (int i = 0; i < pic->i_planes; i++) - { - res->p[i].i_lines = pic->p[i].i_lines; /* FIXME seems wrong*/ - res->p[i].i_pitch = pic->p[i].i_pitch; - } - if (PictureResourceAlloc (vd, res, p_sys->att->data_size, - p_sys->conn, p_sys->shm)) - break; + res->p[i].i_lines = (data_size - offsets[i]) / pitches[i]; + res->p[i].i_pitch = pitches[i]; + } - /* Allocate further planes as specified by XVideo */ - /* We assume that offsets[0] is zero */ - for (int i = 1; i < pic->i_planes; i++) - res->p[i].p_pixels = res->p[0].p_pixels + offsets[i]; - if (vd->fmt.i_chroma == VLC_CODEC_YV12) - { /* 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; - } + if (PictureResourceAlloc (vd, res, p_sys->att->data_size, + p_sys->conn, p_sys->shm)) + break; - pic_array[count] = picture_NewFromResource (&vd->fmt, res); - if (!pic_array[count]) - { - PictureResourceFree (res, p_sys->conn); - memset (res, 0, sizeof(*res)); - break; - } - } - picture_Release (pic); + /* Allocate further planes as specified by XVideo */ + /* We assume that offsets[0] is zero */ + for (unsigned i = 1; i < num_planes; i++) + res->p[i].p_pixels = res->p[0].p_pixels + offsets[i]; - if (count == 0) - return NULL; + 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; + } - p_sys->pool = picture_pool_New (count, pic_array); - if (!p_sys->pool) + pic_array[count] = picture_NewFromResource (&vd->fmt, res); + if (!pic_array[count]) { - /* TODO release picture resources */ - return NULL; + PictureResourceFree (res, p_sys->conn); + memset (res, 0, sizeof(*res)); + break; } - /* FIXME should also do it in case of error ? */ - xcb_flush (p_sys->conn); } - return picture_pool_Get (p_sys->pool); + if (count == 0) + return; + + p_sys->pool = picture_pool_New (count, pic_array); + /* TODO release picture resources if NULL */ + xcb_flush (p_sys->conn); +} + +/** + * Return a direct buffer + */ +static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) +{ + vout_display_sys_t *p_sys = vd->sys; + + if (!p_sys->pool) + PoolAlloc (vd, requested_count); + + return p_sys->pool; } /** * Sends an image to the X server. */ -static void Display (vout_display_t *vd, picture_t *pic) +static void Display (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture) { 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) ck = xcb_xv_shm_put_image_checked (p_sys->conn, p_sys->port, p_sys->window, p_sys->gc, segment, p_sys->id, 0, @@ -613,7 +735,7 @@ static void Display (vout_display_t *vd, picture_t *pic) 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_visible_lines, false); + pic->p->i_lines, false); else ck = xcb_xv_put_image_checked (p_sys->conn, p_sys->port, p_sys->window, p_sys->gc, p_sys->id, @@ -622,7 +744,8 @@ static void Display (vout_display_t *vd, picture_t *pic) vd->source.i_visible_width, vd->source.i_visible_height, 0, 0, p_sys->width, p_sys->height, - vd->source.i_width, vd->source.i_height, + pic->p->i_pitch / pic->p->i_pixel_pitch, + pic->p->i_lines, p_sys->data_size, pic->p->p_pixels); /* Wait for reply. See x11.c for rationale. */ @@ -632,8 +755,9 @@ static void Display (vout_display_t *vd, picture_t *pic) msg_Dbg (vd, "%s: X11 error %d", "cannot put image", e->error_code); free (e); } - +out: picture_Release (pic); + (void)subpicture; } static int Control (vout_display_t *vd, int query, va_list ap) @@ -656,6 +780,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) { 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) @@ -667,10 +792,13 @@ static int Control (vout_display_t *vd, int query, va_list ap) { 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, @@ -693,18 +821,19 @@ static int Control (vout_display_t *vd, int query, va_list ap) xcb_flush (p_sys->conn); return VLC_SUCCESS; } - case VOUT_DISPLAY_CHANGE_ON_TOP: + case VOUT_DISPLAY_CHANGE_WINDOW_STATE: { - int on_top = (int)va_arg (ap, int); - return vout_window_SetOnTop (p_sys->embed, on_top); + unsigned state = va_arg (ap, unsigned); + return vout_window_SetState (p_sys->embed, state); } - /* TODO */ -#if 0 /* Hide the mouse. It will be send when * vout_display_t::info.b_hide_mouse is false */ - VOUT_DISPLAY_HIDE_MOUSE, -#endif + 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 }); + xcb_flush (p_sys->conn); + return VLC_SUCCESS; case VOUT_DISPLAY_RESET_PICTURES: assert(0); default: @@ -717,6 +846,6 @@ static void Manage (vout_display_t *vd) { vout_display_sys_t *p_sys = vd->sys; - ManageEvent (vd, p_sys->conn, p_sys->window); + ManageEvent (vd, p_sys->conn, &p_sys->visible); }