* Copyright © 2009 Rémi Denis-Courmont
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2.0
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
# include <config.h>
#endif
#include <stdarg.h>
+#include <assert.h>
#include <xcb/xcb.h>
#include <vlc_common.h>
#include <vlc_demux.h>
#define HEIGHT_LONGTEXT N_( \
"Pixel height of the capture region, or 0 for full height")
+#define FOLLOW_MOUSE_TEXT N_( "Follow the mouse" )
+#define FOLLOW_MOUSE_LONGTEXT N_( \
+ "Follow the mouse when capturing a subscreen." )
+
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
add_integer ("screen-height", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true)
change_integer_range (0, 65535)
change_safe ()
+ add_bool ("screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
+ FOLLOW_MOUSE_LONGTEXT, true)
- add_shortcut ("screen")
- add_shortcut ("window")
+ add_shortcut ("screen", "window")
vlc_module_end ()
/*
*/
static void Demux (void *);
static int Control (demux_t *, int, va_list);
+static es_out_id_t *InitES (demux_t *, uint_fast16_t, uint_fast16_t,
+ uint_fast8_t);
struct demux_sys_t
{
xcb_connection_t *conn;
es_out_id_t *es;
- es_format_t fmt;
mtime_t pts, interval;
- xcb_window_t root, window;
+ float rate;
+ xcb_window_t window;
int16_t x, y;
uint16_t w, h;
+ uint16_t cur_w, cur_h;
+ bool follow_mouse;
/* fmt, es and pts are protected by the lock. The rest is read-only. */
vlc_mutex_t lock;
/* Timer does not use this, only input thread: */
demux->p_sys = p_sys;
/* Connect to X server */
- char *display = var_CreateGetNonEmptyString (obj, "x11-display");
+ char *display = var_InheritString (obj, "x11-display");
int snum;
xcb_connection_t *conn = xcb_connect (display, &snum);
free (display);
}
p_sys->conn = conn;
- /* Find configured screen */
- const xcb_setup_t *setup = xcb_get_setup (conn);
- const xcb_screen_t *scr = NULL;
- for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
- i.rem > 0; xcb_screen_next (&i))
+ /* Find configured screen */
+ if (!strcmp (demux->psz_access, "screen"))
{
- if (snum == 0)
+ const xcb_setup_t *setup = xcb_get_setup (conn);
+ const xcb_screen_t *scr = NULL;
+ for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
+ i.rem > 0; xcb_screen_next (&i))
{
- scr = i.data;
- break;
+ if (snum == 0)
+ {
+ scr = i.data;
+ break;
+ }
+ snum--;
}
- snum--;
- }
- if (scr == NULL)
- {
- msg_Err (obj, "bad X11 screen number");
- goto error;
+ if (scr == NULL)
+ {
+ msg_Err (obj, "bad X11 screen number");
+ goto error;
+ }
+ p_sys->window = scr->root;
}
-
- /* Determine capture window */
- p_sys->root = scr->root;
- if (!strcmp (demux->psz_access, "screen"))
- p_sys->window = p_sys->root;
else
+ /* Determine capture window */
if (!strcmp (demux->psz_access, "window"))
{
char *end;
- unsigned long ul = strtoul (demux->psz_path, &end, 0);
+ unsigned long ul = strtoul (demux->psz_location, &end, 0);
if (*end || ul > 0xffffffff)
{
- msg_Err (obj, "bad X11 drawable %s", demux->psz_path);
+ msg_Err (obj, "bad X11 drawable %s", demux->psz_location);
goto error;
}
p_sys->window = ul;
goto error;
/* Window properties */
- p_sys->x = var_CreateGetInteger (obj, "screen-left");
- p_sys->y = var_CreateGetInteger (obj, "screen-top");
- p_sys->w = var_CreateGetInteger (obj, "screen-width");
- p_sys->h = var_CreateGetInteger (obj, "screen-height");
-
- uint32_t chroma = 0;
- uint8_t bpp;
- for (const xcb_format_t *fmt = xcb_setup_pixmap_formats (setup),
- *end = fmt + xcb_setup_pixmap_formats_length (setup);
- fmt < end; fmt++)
- {
- if (fmt->depth != scr->root_depth)
- continue;
- bpp = fmt->depth;
- switch (fmt->depth)
- {
- case 32:
- if (fmt->bits_per_pixel == 32)
- chroma = VLC_CODEC_RGBA;
- break;
- case 24:
- if (fmt->bits_per_pixel == 32)
- {
- chroma = VLC_CODEC_RGB32;
- bpp = 32;
- }
- else if (fmt->bits_per_pixel == 24)
- chroma = VLC_CODEC_RGB24;
- break;
- case 16:
- if (fmt->bits_per_pixel == 16)
- chroma = VLC_CODEC_RGB16;
- break;
- case 15:
- if (fmt->bits_per_pixel == 16)
- chroma = VLC_CODEC_RGB15;
- break;
- case 8: /* XXX: screw grey scale! */
- if (fmt->bits_per_pixel == 8)
- chroma = VLC_CODEC_RGB8;
- break;
- }
- if (chroma != 0)
- break;
- }
-
- if (!chroma)
- {
- msg_Err (obj, "unsupported pixmap formats");
- goto error;
- }
+ p_sys->x = var_InheritInteger (obj, "screen-left");
+ p_sys->y = var_InheritInteger (obj, "screen-top");
+ p_sys->w = var_InheritInteger (obj, "screen-width");
+ p_sys->h = var_InheritInteger (obj, "screen-height");
+ p_sys->follow_mouse = var_InheritBool (obj, "screen-follow-mouse");
/* Initializes format */
- float rate = var_CreateGetFloat (obj, "screen-fps");
- if (!rate)
+ p_sys->rate = var_InheritFloat (obj, "screen-fps");
+ if (!p_sys->rate)
goto error;
- p_sys->interval = (float)CLOCK_FREQ / rate;
+ p_sys->interval = (float)CLOCK_FREQ / p_sys->rate;
if (!p_sys->interval)
goto error;
var_Create (obj, "screen-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
- es_format_Init (&p_sys->fmt, VIDEO_ES, chroma);
- p_sys->fmt.video.i_chroma = chroma;
- p_sys->fmt.video.i_bits_per_pixel = bpp;
- p_sys->fmt.video.i_sar_num = p_sys->fmt.video.i_sar_den = 1;
- p_sys->fmt.video.i_frame_rate = 1000 * rate;
- p_sys->fmt.video.i_frame_rate_base = 1000;
+ p_sys->cur_w = 0;
+ p_sys->cur_h = 0;
p_sys->es = NULL;
p_sys->pts = VLC_TS_INVALID;
vlc_mutex_init (&p_sys->lock);
xcb_connection_t *conn = p_sys->conn;
/* Update capture region (if needed) */
- xcb_get_geometry_cookie_t gc = xcb_get_geometry (conn, p_sys->window);
- int16_t x = p_sys->x, y = p_sys->y;
- xcb_translate_coordinates_cookie_t tc;
- if (p_sys->window != p_sys->root)
- tc = xcb_translate_coordinates (conn, p_sys->window, p_sys->root,
- x, y);
-
- xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply (conn, gc, NULL);
+ xcb_get_geometry_reply_t *geo =
+ xcb_get_geometry_reply (conn,
+ xcb_get_geometry (conn, p_sys->window), NULL);
if (geo == NULL)
{
msg_Err (demux, "bad X11 drawable 0x%08"PRIx32, p_sys->window);
return;
}
- uint16_t w = geo->width - x;
- uint16_t h = geo->height - y;
+ xcb_window_t root = geo->root;
+ int16_t x = p_sys->x, y = p_sys->y;
+ xcb_translate_coordinates_cookie_t tc;
+ xcb_query_pointer_cookie_t qc;
+
+ if (p_sys->window != root)
+ tc = xcb_translate_coordinates (conn, p_sys->window, root,
+ x, y);
+ if (p_sys->follow_mouse)
+ qc = xcb_query_pointer (conn, p_sys->window);
+
+ uint16_t ow = geo->width - x;
+ uint16_t oh = geo->height - y;
+ uint16_t w = p_sys->w;
+ uint16_t h = p_sys->h;
+ if (w == 0 || w > ow)
+ w = ow;
+ if (h == 0 || h > oh)
+ h = oh;
+ uint8_t depth = geo->depth;
free (geo);
- if (p_sys->w > 0 && p_sys->w < w)
- w = p_sys->w;
- if (p_sys->h > 0 && p_sys->h < h)
- h = p_sys->h;
- if (p_sys->window != p_sys->root)
+ if (p_sys->window != root)
{
xcb_translate_coordinates_reply_t *coords =
xcb_translate_coordinates_reply (conn, tc, NULL);
- if (coords == NULL)
- return;
- x = coords->dst_x;
- y = coords->dst_y;
- free (coords);
+ if (coords != NULL)
+ {
+ x = coords->dst_x;
+ y = coords->dst_y;
+ free (coords);
+ }
+ }
+
+ if (p_sys->follow_mouse)
+ {
+ xcb_query_pointer_reply_t *ptr =
+ xcb_query_pointer_reply (conn, qc, NULL);
+ if (ptr != NULL)
+ {
+ int16_t min_x = x + (w / 2);
+ int16_t min_y = y + (h / 2);
+ int16_t max_x = x + ow - ((w + 1) / 2);
+ int16_t max_y = y + oh - ((h + 1) / 2);
+
+ assert (max_x >= min_x); /* max_x - min_x = ow - w >= 0 */
+ if (ptr->root_x > max_x)
+ x += ow - w;
+ else if (ptr->root_x > min_x)
+ x += ptr->root_x - min_x;
+
+ assert (max_y >= min_y);
+ if (ptr->root_y > max_y)
+ y += oh - h;
+ else if (ptr->root_y > min_y)
+ y += ptr->root_y - min_y;
+ }
}
+ /* Capture screen */
xcb_get_image_reply_t *img;
img = xcb_get_image_reply (conn,
- xcb_get_image (conn, XCB_IMAGE_FORMAT_Z_PIXMAP, p_sys->root,
+ xcb_get_image (conn, XCB_IMAGE_FORMAT_Z_PIXMAP, root,
x, y, w, h, ~0), NULL);
if (img == NULL)
return;
- /* Send block - zero copy */
block_t *block = block_heap_Alloc (img, xcb_get_image_data (img),
xcb_get_image_data_length (img));
if (block == NULL)
return;
+ /* Update elementary stream format (if needed) */
vlc_mutex_lock (&p_sys->lock);
- if (w != p_sys->fmt.video.i_visible_width
- || h != p_sys->fmt.video.i_visible_height)
+ if (w != p_sys->cur_w || h != p_sys->cur_h)
{
if (p_sys->es != NULL)
es_out_Del (demux->out, p_sys->es);
- p_sys->fmt.video.i_visible_width = p_sys->fmt.video.i_width = w;
- p_sys->fmt.video.i_visible_height = p_sys->fmt.video.i_height = h;
- p_sys->es = es_out_Add (demux->out, &p_sys->fmt);
+ p_sys->es = InitES (demux, w, h, depth);
+ if (p_sys->es != NULL)
+ {
+ p_sys->cur_w = w;
+ p_sys->cur_h = h;
+ }
}
- /* Capture screen */
+ /* Send block - zero copy */
if (p_sys->es != NULL)
{
if (p_sys->pts == VLC_TS_INVALID)
}
vlc_mutex_unlock (&p_sys->lock);
}
+
+static es_out_id_t *InitES (demux_t *demux, uint_fast16_t width,
+ uint_fast16_t height, uint_fast8_t depth)
+{
+ demux_sys_t *p_sys = demux->p_sys;
+ const xcb_setup_t *setup = xcb_get_setup (p_sys->conn);
+ uint32_t chroma = 0;
+ uint8_t bpp;
+
+ for (const xcb_format_t *fmt = xcb_setup_pixmap_formats (setup),
+ *end = fmt + xcb_setup_pixmap_formats_length (setup);
+ fmt < end; fmt++)
+ {
+ if (fmt->depth != depth)
+ continue;
+ bpp = fmt->depth;
+ switch (fmt->depth)
+ {
+ case 32:
+ if (fmt->bits_per_pixel == 32)
+ chroma = VLC_CODEC_RGBA;
+ break;
+ case 24:
+ if (fmt->bits_per_pixel == 32)
+ {
+ chroma = VLC_CODEC_RGB32;
+ bpp = 32;
+ }
+ else if (fmt->bits_per_pixel == 24)
+ chroma = VLC_CODEC_RGB24;
+ break;
+ case 16:
+ if (fmt->bits_per_pixel == 16)
+ chroma = VLC_CODEC_RGB16;
+ break;
+ case 15:
+ if (fmt->bits_per_pixel == 16)
+ chroma = VLC_CODEC_RGB15;
+ break;
+ case 8: /* XXX: screw grey scale! */
+ if (fmt->bits_per_pixel == 8)
+ chroma = VLC_CODEC_RGB8;
+ break;
+ }
+ if (chroma != 0)
+ break;
+ }
+
+ if (!chroma)
+ {
+ msg_Err (demux, "unsupported pixmap formats");
+ return NULL;
+ }
+
+ es_format_t fmt;
+
+ es_format_Init (&fmt, VIDEO_ES, chroma);
+ fmt.video.i_chroma = chroma;
+ fmt.video.i_bits_per_pixel = bpp;
+ fmt.video.i_sar_num = fmt.video.i_sar_den = 1;
+ fmt.video.i_frame_rate = 1000 * p_sys->rate;
+ fmt.video.i_frame_rate_base = 1000;
+ fmt.video.i_visible_width = fmt.video.i_width = width;
+ fmt.video.i_visible_height = fmt.video.i_height = height;
+
+ return es_out_Add (demux->out, &fmt);
+}
projects / vlc / blobdiff