*/
/**
- * @file libavdevice/x11grab.c
+ * @file
* X11 frame device demuxer by Clemens Fruhwirth <clemens@endorphin.org>
* and Edouard Gomez <ed.gomez@free.fr>.
*/
+#define _XOPEN_SOURCE 600
+
#include "config.h"
#include "libavformat/avformat.h"
#include <time.h>
XImage *image; /**< X11 image holding the grab */
int use_shm; /**< !0 when using XShm extension */
XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm infos */
- int mouse_warning_shown;
+ int nomouse;
};
/**
- * Initializes the x11 grab device demuxer (public device demuxer API).
+ * Initialize the x11 grab device demuxer (public device demuxer API).
*
* @param s1 Context from avformat core
* @param ap Parameters from avformat core
struct x11_grab *x11grab = s1->priv_data;
Display *dpy;
AVStream *st = NULL;
- int input_pixfmt;
+ enum PixelFormat input_pixfmt;
XImage *image;
int x_off = 0;
int y_off = 0;
offset = strchr(param, '+');
if (offset) {
sscanf(offset, "%d,%d", &x_off, &y_off);
+ x11grab->nomouse= strstr(offset, "nomouse");
*offset= 0;
}
return AVERROR(EIO);
}
- if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
+ if (ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
av_log(s1, AV_LOG_ERROR, "AVParameters don't have video size and/or rate. Use -s and -r.\n");
return AVERROR(EIO);
}
x11grab->y_off = y_off;
x11grab->image = image;
x11grab->use_shm = use_shm;
- x11grab->mouse_warning_shown = 0;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_RAWVIDEO;
st->codec->width = ap->width;
st->codec->height = ap->height;
}
/**
- * Mouse painting helper function that applies an 'and' and 'or' mask pair to
- * '*dst' pixel. It actually draws a mouse pointer pixel to grabbed frame.
- *
- * @param dst Destination pixel
- * @param and Part of the mask that must be applied using a bitwise 'and'
- * operator
- * @param or Part of the mask that must be applied using a bitwise 'or'
- * operator
- * @param bits_per_pixel Bits per pixel used in the grabbed image
- */
-static void inline
-apply_masks(uint8_t *dst, int and, int or, int bits_per_pixel)
-{
- switch (bits_per_pixel) {
- case 32:
- *(uint32_t*)dst = (*(uint32_t*)dst & and) | or;
- break;
- case 16:
- *(uint16_t*)dst = (*(uint16_t*)dst & and) | or;
- break;
- case 8:
- *dst = !!or;
- break;
- }
-}
-
-/**
- * Paints a mouse pointer in an X11 image.
+ * Paint a mouse pointer in an X11 image.
*
* @param image image to paint the mouse pointer to
* @param s context used to retrieve original grabbing rectangle
* coordinates
- * @param x Mouse pointer coordinate
- * @param y Mouse pointer coordinate
*/
static void
paint_mouse_pointer(XImage *image, struct x11_grab *s)
int x, y;
int line, column;
int to_line, to_column;
- int image_addr, xcim_addr;
+ int pixstride = image->bits_per_pixel >> 3;
+ /* Warning: in its insanity, xlib provides unsigned image data through a
+ * char* pointer, so we have to make it uint8_t to make things not break.
+ * Anyone who performs further investigation of the xlib API likely risks
+ * permanent brain damage. */
+ uint8_t *pix = image->data;
+
+ /* Code doesn't currently support 16-bit or PAL8 */
+ if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
+ return;
- xcim = XFixesGetCursorImage(dpy);;
+ xcim = XFixesGetCursorImage(dpy);
x = xcim->x - xcim->xhot;
y = xcim->y - xcim->yhot;
for (line = FFMAX(y, y_off); line < to_line; line++) {
for (column = FFMAX(x, x_off); column < to_column; column++) {
- xcim_addr = (line - y) * xcim->width + column - x;
-
- if ((unsigned char)(xcim->pixels[xcim_addr] >> 24) != 0) { // skip fully transparent pixel
- image_addr = ((line - y_off) * width + column - x_off) * 4;
-
- image->data[image_addr] = (unsigned char)(xcim->pixels[xcim_addr] >> 0);
- image->data[image_addr+1] = (unsigned char)(xcim->pixels[xcim_addr] >> 8);
- image->data[image_addr+2] = (unsigned char)(xcim->pixels[xcim_addr] >> 16);
+ int xcim_addr = (line - y) * xcim->width + column - x;
+ int image_addr = ((line - y_off) * width + column - x_off) * pixstride;
+ int r = (uint8_t)(xcim->pixels[xcim_addr] >> 0);
+ int g = (uint8_t)(xcim->pixels[xcim_addr] >> 8);
+ int b = (uint8_t)(xcim->pixels[xcim_addr] >> 16);
+ int a = (uint8_t)(xcim->pixels[xcim_addr] >> 24);
+
+ if (a == 255) {
+ pix[image_addr+0] = r;
+ pix[image_addr+1] = g;
+ pix[image_addr+2] = b;
+ } else if (a) {
+ /* pixel values from XFixesGetCursorImage come premultiplied by alpha */
+ pix[image_addr+0] = r + (pix[image_addr+0]*(255-a) + 255/2) / 255;
+ pix[image_addr+1] = g + (pix[image_addr+1]*(255-a) + 255/2) / 255;
+ pix[image_addr+2] = b + (pix[image_addr+2]*(255-a) + 255/2) / 255;
}
}
}
/**
- * Reads new data in the image structure.
+ * Read new data in the image structure.
*
* @param dpy X11 display to grab from
* @param d
}
/**
- * Grabs a frame from x11 (public device demuxer API).
+ * Grab a frame from x11 (public device demuxer API).
*
* @param s1 Context from avformat core
* @param pkt Packet holding the brabbed frame
}
}
- {
+ if(!s->nomouse){
paint_mouse_pointer(image, s);
}
}
/**
- * Closes x11 frame grabber (public device demuxer API).
+ * Close x11 frame grabber (public device demuxer API).
*
* @param s1 Context from avformat core
* @return 0 success, !0 failure
projects / ffmpeg / blobdiff