#include <stdlib.h>
#include <assert.h>
+#include <sys/types.h>
+#include <sys/shm.h>
+
#include <xcb/xcb.h>
+#include <xcb/shm.h>
+
#include <xcb/xcb_aux.h>
#include <xcb/xcb_image.h>
#include <vlc_vout.h>
#include <vlc_window.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 SHM_TEXT N_("Use shared memory")
+#define SHM_LONGTEXT N_( \
+ "Use shared memory to communicate between VLC and the X server.")
+
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
add_string ("x11-display", NULL, NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
+ add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
vlc_module_end ()
struct vout_sys_t
xcb_window_t parent; /* parent X window */
xcb_window_t window; /* drawable X window */
xcb_gcontext_t gc; /* context to put images */
+ bool shm; /* whether to use MIT-SHM */
uint8_t bpp; /* bits per pixel */
};
static void Display (vout_thread_t *, picture_t *);
static int Manage (vout_thread_t *);
-static int CheckError (vout_thread_t *vout, const char *str,
- xcb_void_cookie_t ck)
+int CheckError (vout_thread_t *vout, const char *str, xcb_void_cookie_t ck)
{
xcb_generic_error_t *err;
}
p_sys->vid = vt->visual_id;
+ p_sys->shm = var_CreateGetBool (vout, "x11-shm") > 0;
+ if (p_sys->shm)
+ {
+ xcb_shm_query_version_cookie_t ck;
+ xcb_shm_query_version_reply_t *r;
+ xcb_generic_error_t *err;
+
+ ck = xcb_shm_query_version (p_sys->conn);
+ r = xcb_shm_query_version_reply (p_sys->conn, ck, &err);
+ if (!r)
+ {
+ msg_Err (vout, "shared memory (MIT-SHM) not available");
+ msg_Warn (vout, "display will be slow");
+ p_sys->shm = false;
+ }
+ }
+
vout->pf_init = Init;
vout->pf_end = Deinit;
vout->pf_display = Display;
struct picture_sys_t
{
+ xcb_connection_t *conn;
xcb_image_t *image;
+ xcb_shm_seg_t segment;
};
static void PictureRelease (picture_t *pic);
+static void PictureShmRelease (picture_t *pic);
+#define SHM_ERR ((void *)(intptr_t)(-1))
static int PictureInit (vout_thread_t *vout, picture_t *pic)
{
vout->output.i_width, vout->output.i_height,
vout->output.i_aspect);
+ void *shm = SHM_ERR;
+ const size_t size = pic->p->i_pitch * pic->p->i_lines;
+
+ if (p_sys->shm)
+ { /* Allocate shared memory segment */
+ int id = shmget (IPC_PRIVATE, size, IPC_CREAT | 0700);
+
+ if (id == -1)
+ {
+ msg_Err (vout, "shared memory allocation error: %m");
+ goto error;
+ }
+
+ /* Attach the segment to VLC */
+ shm = shmat (id, NULL, 0 /* read/write */);
+ if (shm == SHM_ERR)
+ {
+ msg_Err (vout, "shared memory attachment error: %m");
+ shmctl (id, IPC_RMID, 0);
+ goto error;
+ }
+
+ /* Attach the segment to X */
+ xcb_void_cookie_t ck;
+
+ priv->segment = xcb_generate_id (p_sys->conn);
+ ck = xcb_shm_attach_checked (p_sys->conn, priv->segment, id, 1);
+ shmctl (id, IPC_RMID, 0);
+
+ if (CheckError (vout, "shared memory server-side error", ck))
+ {
+ msg_Info (vout, "using buggy X (remote) server? SSH?");
+ shmdt (shm);
+ shm = SHM_ERR;
+ }
+ }
+
const unsigned real_width = pic->p->i_pitch / (p_sys->bpp >> 3);
/* FIXME: anyway to getthing more intuitive than that?? */
XCB_IMAGE_ORDER_LSB_FIRST,
#endif
XCB_IMAGE_ORDER_MSB_FIRST,
- NULL, 0, NULL);
+ NULL,
+ (shm != SHM_ERR) ? size : 0,
+ (shm != SHM_ERR) ? shm : NULL);
if (img == NULL)
+ {
+ if (shm != SHM_ERR)
+ xcb_shm_detach (p_sys->conn, priv->segment);
+ goto error;
+ }
+ if (shm != SHM_ERR && xcb_image_native (p_sys->conn, img, 0) == NULL)
+ {
+ msg_Err (vout, "incompatible X server image format");
+ xcb_image_destroy (img);
goto error;
+ }
+ priv->conn = p_sys->conn;
priv->image = img;
pic->p_sys = priv;
pic->p->p_pixels = img->data;
- pic->pf_release = PictureRelease;
+ pic->pf_release = (shm != SHM_ERR) ? PictureShmRelease
+ : PictureRelease;
pic->i_status = DESTROYED_PICTURE;
pic->i_type = DIRECT_PICTURE;
return VLC_SUCCESS;
error:
+ if (shm != SHM_ERR)
+ shmdt (shm);
free (p_sys);
return VLC_EGENERIC;
}
free (p_sys);
}
+/**
+ * Release shared memory picture private data
+ */
+static void PictureShmRelease (picture_t *pic)
+{
+ struct picture_sys_t *p_sys = pic->p_sys;
+
+ xcb_shm_detach (p_sys->conn, p_sys->segment);
+ shmdt (p_sys->image->data);
+ PictureRelease (pic);
+}
+
/**
* Allocate drawable window and picture buffers.
*/
/* FIXME: I don't get the subtlety between output and fmt_out here */
/* Create window */
+ const uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
+ uint32_t values[2] = {
+ /* XCB_CW_BACK_PIXEL */
+ screen->black_pixel,
+ /* 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 (p_sys->conn);
- p_sys->window = window;
c = xcb_create_window_checked (p_sys->conn, screen->root_depth, window,
p_sys->parent, x, y, width, height, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
- screen->root_visual, 0, NULL);
+ screen->root_visual, mask, values);
if (CheckError (vout, "cannot create X11 window", c))
goto error;
+ p_sys->window = window;
msg_Dbg (vout, "using X11 window %08"PRIx32, p_sys->window);
xcb_map_window (p_sys->conn, window);
static void Display (vout_thread_t *vout, picture_t *pic)
{
vout_sys_t *p_sys = vout->p_sys;
- xcb_image_t *img = pic->p_sys->image;
- xcb_image_t *native = xcb_image_native (p_sys->conn, img, 1);
+ picture_sys_t *priv = pic->p_sys;
+ xcb_image_t *img = priv->image;
- if (native == NULL)
+ if (img->base == NULL)
{
- msg_Err (vout, "image conversion failure");
- return;
+ xcb_shm_segment_info_t info = {
+ .shmseg = priv->segment,
+ .shmid = -1, /* lost track of it, unimportant */
+ .shmaddr = img->data,
+ };
+
+ xcb_image_shm_put (p_sys->conn, p_sys->window, p_sys->gc, img, info,
+ 0, 0, 0, 0, img->width, img->height, 0);
}
+ else
+ {
+ xcb_image_t *native = xcb_image_native (p_sys->conn, img, 1);
- xcb_image_put (p_sys->conn, p_sys->window, p_sys->gc, native, 0, 0, 0);
- xcb_flush (p_sys->conn);
+ if (native == NULL)
+ return;
- if (native != img)
- {
- /*msg_Warn (vout, "image not in native X11 pixmap format");*/
- xcb_image_destroy (native);
+ xcb_image_put (p_sys->conn, p_sys->window, p_sys->gc, native, 0, 0, 0);
+ if (native != img)
+ xcb_image_destroy (native);
}
+ xcb_flush (p_sys->conn);
}
/**
xcb_generic_event_t *ev;
while ((ev = xcb_poll_for_event (p_sys->conn)) != NULL)
- {
- switch (ev->response_type & ~0x80)
- {
- default:
- msg_Dbg (vout, "unhandled event %02x", (unsigned)ev->response_type);
- }
- free (ev);
- }
+ ProcessEvent (vout, ev);
if (xcb_connection_has_error (p_sys->conn))
{
projects / vlc / blobdiff