X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fxcb%2Fxvideo.c;h=da09276b405c5b3696ae5fd2260f41be26d40690;hb=ac49700607b46e824d93671722c8442aad409a6a;hp=03e9670bb6a3becbfcd7d3996bd89755fe0fa448;hpb=c0e40cc1e6043d5b987fe39bfc5b2db6c27131b2;p=vlc diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index 03e9670bb6..da09276b40 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -66,12 +66,10 @@ vlc_module_begin () 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 { @@ -86,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 */ @@ -147,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) @@ -295,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; @@ -314,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)) { @@ -322,15 +327,16 @@ 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; @@ -393,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; @@ -441,18 +450,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)) { @@ -463,6 +491,7 @@ static int Open (vlc_object_t *obj) } } xcb_xv_ungrab_port (conn, p_sys->port, XCB_CURRENT_TIME); + msg_Dbg (vd, "no usable X11 visual"); continue; /* No workable XVideo format (visual/depth) */ created_window: @@ -509,6 +538,7 @@ static int Open (vlc_object_t *obj) /* */ 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; @@ -521,10 +551,13 @@ static int Open (vlc_object_t *obj) 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; @@ -555,6 +588,11 @@ 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); @@ -567,31 +605,31 @@ static void Close (vlc_object_t *obj) static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) { vout_display_sys_t *p_sys = vd->sys; - (void)requested_count; 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); p_sys->data_size = p_sys->att->data_size; unsigned count; picture_t *pic_array[MAX_PICTURES]; - for (count = 0; count < MAX_PICTURES; count++) + 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 < pic->i_planes; i++) + for (int i = 0; i < __MIN (p_sys->att->num_planes, PICTURE_PLANE_MAX); i++) { - res->p[i].i_lines = pic->p[i].i_lines; /* FIXME seems wrong*/ - res->p[i].i_pitch = pic->p[i].i_pitch; + 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)) @@ -599,9 +637,9 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) /* Allocate further planes as specified by XVideo */ /* We assume that offsets[0] is zero */ - for (int i = 1; i < pic->i_planes; i++) + 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 (vd->fmt.i_chroma == VLC_CODEC_YV12) + 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; @@ -616,7 +654,6 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count) break; } } - picture_Release (pic); if (count == 0) return NULL; @@ -734,16 +771,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: