#include <vlc_plugin.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 " \
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)
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 */
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 *);
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;
}
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)
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;
}
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);
/* 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);
+ xcb_xv_query_adaptors (conn, p_sys->embed->xid), NULL);
if (adaptors == NULL)
goto error;
xcb_xv_adaptor_info_iterator_t it;
for (it = xcb_xv_query_adaptors_info_iterator (adaptors);
- it.rem > 0;
+ it.rem > 0 && !found_adaptor;
xcb_xv_adaptor_info_next (&it))
{
const xcb_xv_adaptor_info_t *a = it.data;
if (r == NULL)
continue;
- const xcb_xv_image_format_info_t *xfmt;
-
- /* */
+ /* 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,
else
chromas = chromas_default;
+ vlc_fourcc_t chroma;
for (size_t i = 0; chromas[i]; i++)
{
- vlc_fourcc_t chroma = chromas[i];
+ 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)
{
+ p_sys->id = xfmt->id;
fmt.i_chroma = chroma;
- goto found_format;
+ 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:
/* Grab a port */
for (unsigned i = 0; i < a->num_ports; i++)
{
}
msg_Dbg (vd, "cannot grab port %"PRIu32, port);
}
- 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)
{
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 != depth)
+ continue; /* this would fail anyway */
+
+ const uint32_t mask =
+ /* XCB_CW_EVENT_MASK */
+ XCB_EVENT_MASK_VISIBILITY_CHANGE;
+ xcb_void_cookie_t c;
+
+ 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);
+
+ 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);
+ xcb_xv_ungrab_port (conn, p_sys->port, XCB_CURRENT_TIME);
+ continue; /* No workable XVideo format (visual/depth) */
+
+ created_window:
found_adaptor = true;
break;
}
msg_Err (vd, "no available XVideo adaptor");
goto error;
}
-
- /* Create window */
+ else
{
- const uint32_t mask =
- /* XCB_CW_EVENT_MASK */
- XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
- XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_VISIBILITY_CHANGE;
- 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 0x%08"PRIx32, window);
- xcb_map_window (conn, window);
+ xcb_map_window (conn, p_sys->window);
vout_display_place_t place;
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;
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);
- /* */
- p_sys->pool = NULL;
+ /* Create cursor */
+ p_sys->cursor = CreateBlankCursor (conn, screen);
+
+ CheckSHM (obj, conn, &p_sys->shm);
/* */
vout_display_info_t info = vd->info;
vd->fmt = fmt;
vd->info = info;
- vd->get = Get;
+ vd->pool = Pool;
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
if (!res->p->p_pixels)
break;
- PictureResourceFree (res, p_sys->conn);
+ PictureResourceFree (res, NULL);
}
picture_pool_Delete (p_sys->pool);
}
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 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);
+ p_sys->att->height, 0, 1);
if (!pic)
return NULL;
return NULL;
p_sys->pool = picture_pool_New (count, pic_array);
- if (!p_sys->pool)
- {
- /* TODO release picture resources */
- return NULL;
- }
- /* FIXME should also do it in case of error ? */
+ /* TODO release picture resources if NULL */
xcb_flush (p_sys->conn);
}
- return picture_pool_Get (p_sys->pool);
+ return p_sys->pool;
}
/**
{
const vout_display_cfg_t *cfg;
const video_format_t *source;
- bool is_forced;
+ bool is_forced = false;
if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
|| query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
case VOUT_DISPLAY_CHANGE_ON_TOP:
{
int on_top = (int)va_arg (ap, int);
- return vout_window_SetOnTop (p_sys->embed, on_top);
+ return vout_window_SetState (p_sys->embed, on_top);
}
- /* 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->xid,
+ XCB_CW_CURSOR, &(uint32_t){ p_sys->cursor });
+ return VLC_SUCCESS;
case VOUT_DISPLAY_RESET_PICTURES:
assert(0);
default:
projects / vlc / blobdiff