X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fxcb%2Fxvideo.c;h=9a0ce12de0be9c854ec5db4fa865c403a3a6a437;hb=27cdf52e972a7bfbde24c7e42b3b8144cc83a7e2;hp=cfd78fa3b762236c293c8c27718f95ba02639f53;hpb=249986fcbdf647d562a609053236add2ec6abe68;p=vlc diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index cfd78fa3b7..9a0ce12de0 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -39,11 +39,6 @@ #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 " \ @@ -67,19 +62,14 @@ vlc_module_begin () set_capability ("vout display", 155) 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, 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_shortcut ("xcb-xv", "xv", "xvideo", "xid") vlc_module_end () -#define MAX_PICTURES (VOUT_MAX_PICTURES) +#define MAX_PICTURES (128) struct vout_display_sys_t { @@ -94,6 +84,7 @@ 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 */ @@ -102,7 +93,7 @@ struct vout_display_sys_t picture_resource_t resource[MAX_PICTURES]; }; -static picture_t *Get (vout_display_t *); +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 *); @@ -116,22 +107,25 @@ 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; } @@ -152,6 +146,8 @@ static vlc_fourcc_t ParseFormat (vout_display_t *vd, case 32: if (f->depth == 24) return VLC_CODEC_RGB32; + if (f->depth == 32) + return 0; /* ARGB -> VLC cannot do that currently */ break; case 24: if (f->depth == 24) @@ -256,8 +252,8 @@ FindFormat (vout_display_t *vd, continue; /* VLC pads scanline to 16 pixels internally */ - unsigned width = (fmt->i_width + 15) & ~15; - unsigned height = (fmt->i_height + 15) & ~15; + 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, @@ -300,6 +296,9 @@ 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)); + + if (!var_InheritBool (obj, "overlay")) + return VLC_EGENERIC; if (p_sys == NULL) return VLC_ENOMEM; @@ -309,7 +308,7 @@ static int Open (vlc_object_t *obj) xcb_connection_t *conn; const xcb_screen_t *screen; uint8_t depth; - p_sys->embed = GetWindow (vd, &conn, &screen, &depth, &p_sys->shm); + p_sys->embed = GetWindow (vd, &conn, &screen, &depth); if (p_sys->embed == NULL) { free (p_sys); @@ -319,6 +318,7 @@ static int Open (vlc_object_t *obj) p_sys->conn = conn; p_sys->att = NULL; p_sys->pool = NULL; + p_sys->swap_uv = false; if (!CheckXVideo (vd, conn)) { @@ -327,23 +327,24 @@ static int Open (vlc_object_t *obj) } 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->xid), NULL); + xcb_xv_query_adaptors (conn, p_sys->embed->handle.xid), NULL); 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; + p_sys->port = 0; xcb_xv_adaptor_info_iterator_t it; for (it = xcb_xv_query_adaptors_info_iterator (adaptors); - it.rem > 0 && !found_adaptor; + it.rem > 0; xcb_xv_adaptor_info_next (&it)) { const xcb_xv_adaptor_info_t *a = it.data; @@ -398,7 +399,10 @@ static int Open (vlc_object_t *obj) if (xfmt != NULL) { p_sys->id = xfmt->id; - fmt.i_chroma = chroma; + 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; @@ -427,7 +431,8 @@ 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; /* No usable port */ @@ -446,18 +451,37 @@ static int Open (vlc_object_t *obj) 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 != depth) + if (f->depth != screen->root_depth) continue; /* this would fail anyway */ - const uint32_t mask = + 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_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->xid, 0, 0, 1, 1, 0, - XCB_WINDOW_CLASS_INPUT_OUTPUT, f->visual, - XCB_CW_EVENT_MASK, &mask); + 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)) { @@ -468,14 +492,15 @@ static int Open (vlc_object_t *obj) } } 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: - found_adaptor = true; break; } free (adaptors); - if (!found_adaptor) + if (!p_sys->port) { msg_Err (vd, "no available XVideo adaptor"); goto error; @@ -509,28 +534,31 @@ static int Open (vlc_object_t *obj) /* Create cursor */ p_sys->cursor = CreateBlankCursor (conn, screen); - /* */ - p_sys->pool = NULL; + 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->get = Get; + vd->pool = Pool; vd->prepare = NULL; vd->display = Display; vd->control = Control; vd->manage = Manage; /* */ - vout_display_SendEventFullscreen (vd, false); + 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, false); + vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen); return VLC_SUCCESS; @@ -561,82 +589,89 @@ static void Close (vlc_object_t *obj) 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); 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)); + + 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; - memset (p_sys->resource, 0, sizeof(p_sys->resource)); + picture_t *pic_array[MAX_PICTURES]; + requested_count = __MIN(requested_count, MAX_PICTURES); - const uint32_t *offsets = - xcb_xv_query_image_attributes_offsets (p_sys->att); - p_sys->data_size = p_sys->att->data_size; + unsigned count; + for (count = 0; count < requested_count; count++) + { + picture_resource_t *res = &p_sys->resource[count]; - unsigned count; - picture_t *pic_array[MAX_PICTURES]; - for (count = 0; count < MAX_PICTURES; 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; } /** @@ -650,6 +685,8 @@ static void Display (vout_display_t *vd, picture_t *pic) if (!p_sys->visible) goto out; + xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET); + 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, @@ -744,16 +781,16 @@ 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); } /* 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->xid, + 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: