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
{
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 */
vout_display_t *vd = (vout_display_t *)obj;
vout_display_sys_t *p_sys = malloc (sizeof (*p_sys));
- if (!var_CreateGetBool (obj, "overlay"))
+ if (!var_InheritBool (obj, "overlay"))
return VLC_EGENERIC;
if (p_sys == NULL)
return VLC_ENOMEM;
p_sys->conn = conn;
p_sys->att = NULL;
p_sys->pool = NULL;
+ p_sys->swap_uv = false;
if (!CheckXVideo (vd, conn))
{
}
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 =
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;
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;
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 */
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->handle.xid, 0, 0, 1, 1, 0,
- XCB_WINDOW_CLASS_INPUT_OUTPUT, f->visual,
- XCB_CW_EVENT_MASK, &mask);
+ XCB_WINDOW_CLASS_INPUT_OUTPUT, f->visual, mask, list);
if (!CheckError (vd, conn, "cannot create X11 window", c))
{
}
}
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;
/* */
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->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;
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);
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, 1);
- 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))
/* 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;
break;
}
}
- picture_Release (pic);
if (count == 0)
return NULL;
projects / vlc / blobdiff