Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'

Browse Source 
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/88/head
Michael Niedermayer 11 years ago
parent 0ddb0516f1 f07a4290a0
commit 5393c9dadd
1 changed files with 139 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 173
      libavdevice/x11grab.c

173
libavdevice/x11grab.c
Unescape View File

@ -37,27 +37,31 @@
*/
#include "config.h"
#include "libavformat/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
#include <time.h>
#include <sys/shm.h>
#include <X11/cursorfont.h>
#include <X11/X.h>
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <sys/shm.h>
#include <X11/extensions/shape.h>
#include <X11/extensions/XShm.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/XShm.h>
#include "avdevice.h"
/**
* X11 Device Demuxer context
*/
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
#include "libavformat/internal.h"
/** X11 device demuxer context */
struct x11grab {
const AVClass *class; /**< Class for private options. */
int frame_size; /**< Size in bytes of a grabbed frame */
@ -85,17 +89,17 @@ struct x11grab {
};
#define REGION_WIN_BORDER 3
/**
* Draw grabbing region window
*
* @param s x11grab context
*/
static void
x11grab_draw_region_win(struct x11grab *s)
static void x11grab_draw_region_win(struct x11grab *s)
{
Display *dpy = s->dpy;
int screen;
Window win = s->region_win;
int screen;
GC gc;
screen = DefaultScreen(dpy);
@ -103,8 +107,7 @@ x11grab_draw_region_win(struct x11grab *s)
XSetForeground(dpy, gc, WhitePixel(dpy, screen));
XSetBackground(dpy, gc, BlackPixel(dpy, screen));
XSetLineAttributes(dpy, gc, REGION_WIN_BORDER, LineDoubleDash, 0, 0);
XDrawRectangle(dpy, win, gc,
1, 1,
XDrawRectangle(dpy, win, gc, 1, 1,
(s->width + REGION_WIN_BORDER * 2) - 1 * 2 - 1,
(s->height + REGION_WIN_BORDER * 2) - 1 * 2 - 1);
XFreeGC(dpy, gc);
@ -115,8 +118,7 @@ x11grab_draw_region_win(struct x11grab *s)
*
* @param s x11grab context
*/
static void
x11grab_region_win_init(struct x11grab *s)
static void x11grab_region_win_init(struct x11grab *s)
{
Display *dpy = s->dpy;
int screen;
@ -155,8 +157,7 @@ x11grab_region_win_init(struct x11grab *s)
* <li>0 success</li>
* </ul>
*/
static int
x11grab_read_header(AVFormatContext *s1)
static int x11grab_read_header(AVFormatContext *s1)
{
struct x11grab *x11grab = s1->priv_data;
Display *dpy;
@ -186,15 +187,16 @@ x11grab_read_header(AVFormatContext *s1)
"use 'draw_mouse' option with value 0 instead\n");
x11grab->draw_mouse = 0;
}
*offset= 0;
*offset = 0;
}
av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n",
av_log(s1, AV_LOG_INFO,
"device: %s -> display: %s x: %d y: %d width: %d height: %d\n",
s1->filename, dpyname, x_off, y_off, x11grab->width, x11grab->height);
dpy = XOpenDisplay(dpyname);
av_freep(&dpyname);
if(!dpy) {
if (!dpy) {
av_log(s1, AV_LOG_ERROR, "Could not open X display.\n");
ret = AVERROR(EIO);
goto out;
@ -215,20 +217,24 @@ x11grab_read_header(AVFormatContext *s1)
screen_w = DisplayWidth(dpy, screen);
screen_h = DisplayHeight(dpy, screen);
XQueryPointer(dpy, RootWindow(dpy, screen), &w, &w, &x_off, &y_off, &ret, &ret, &ret);
XQueryPointer(dpy, RootWindow(dpy, screen), &w, &w, &x_off, &y_off,
&ret, &ret, &ret);
x_off -= x11grab->width / 2;
y_off -= x11grab->height / 2;
x_off = FFMIN(FFMAX(x_off, 0), screen_w - x11grab->width);
y_off = FFMIN(FFMAX(y_off, 0), screen_h - x11grab->height);
av_log(s1, AV_LOG_INFO, "followmouse is enabled, resetting grabbing region to x: %d y: %d\n", x_off, y_off);
av_log(s1, AV_LOG_INFO,
"followmouse is enabled, resetting grabbing region to x: %d y: %d\n",
x_off, y_off);
}
if (x11grab->use_shm) {
use_shm = XShmQueryExtension(dpy);
av_log(s1, AV_LOG_INFO, "shared memory extension%s found\n", use_shm ? "" : " not");
av_log(s1, AV_LOG_INFO,
"shared memory extension%s found\n", use_shm ? "" : " not");
}
if(use_shm) {
if (use_shm) {
int scr = XDefaultScreen(dpy);
image = XShmCreateImage(dpy,
DefaultVisual(dpy, scr),
@ -239,7 +245,7 @@ x11grab_read_header(AVFormatContext *s1)
x11grab->width, x11grab->height);
x11grab->shminfo.shmid = shmget(IPC_PRIVATE,
image->bytes_per_line * image->height,
IPC_CREAT|0777);
IPC_CREAT | 0777);
if (x11grab->shminfo.shmid == -1) {
av_log(s1, AV_LOG_ERROR, "Fatal: Can't get shared memory!\n");
ret = AVERROR(ENOMEM);
@ -256,14 +262,14 @@ x11grab_read_header(AVFormatContext *s1)
}
} else {
image = XGetImage(dpy, RootWindow(dpy, screen),
x_off,y_off,
x_off, y_off,
x11grab->width, x11grab->height,
AllPlanes, ZPixmap);
}
switch (image->bits_per_pixel) {
case 8:
av_log (s1, AV_LOG_DEBUG, "8 bit palette\n");
av_log(s1, AV_LOG_DEBUG, "8 bit palette\n");
input_pixfmt = AV_PIX_FMT_PAL8;
color_map = DefaultColormap(dpy, screen);
for (i = 0; i < 256; ++i)
@ -276,35 +282,43 @@ x11grab_read_header(AVFormatContext *s1)
x11grab->palette_changed = 1;
break;
case 16:
if ( image->red_mask == 0xf800 &&
if (image->red_mask == 0xf800 &&
image->green_mask == 0x07e0 &&
image->blue_mask == 0x001f ) {
av_log (s1, AV_LOG_DEBUG, "16 bit RGB565\n");
image->blue_mask == 0x001f) {
av_log(s1, AV_LOG_DEBUG, "16 bit RGB565\n");
input_pixfmt = AV_PIX_FMT_RGB565;
} else if (image->red_mask == 0x7c00 &&
image->green_mask == 0x03e0 &&
image->blue_mask == 0x001f ) {
image->blue_mask == 0x001f) {
av_log(s1, AV_LOG_DEBUG, "16 bit RGB555\n");
input_pixfmt = AV_PIX_FMT_RGB555;
} else {
av_log(s1, AV_LOG_ERROR, "RGB ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
av_log(s1, AV_LOG_ERROR,
"RGB ordering at image depth %i not supported ... aborting\n",
image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR,
"color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n",
image->red_mask, image->green_mask, image->blue_mask);
ret = AVERROR_PATCHWELCOME;
goto out;
}
break;
case 24:
if ( image->red_mask == 0xff0000 &&
if (image->red_mask == 0xff0000 &&
image->green_mask == 0x00ff00 &&
image->blue_mask == 0x0000ff ) {
image->blue_mask == 0x0000ff) {
input_pixfmt = AV_PIX_FMT_BGR24;
} else if ( image->red_mask == 0x0000ff &&
} else if (image->red_mask == 0x0000ff &&
image->green_mask == 0x00ff00 &&
image->blue_mask == 0xff0000 ) {
image->blue_mask == 0xff0000) {
input_pixfmt = AV_PIX_FMT_RGB24;
} else {
av_log(s1, AV_LOG_ERROR,"rgb ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
av_log(s1, AV_LOG_ERROR,
"rgb ordering at image depth %i not supported ... aborting\n",
image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR,
"color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n",
image->red_mask, image->green_mask, image->blue_mask);
ret = AVERROR_PATCHWELCOME;
goto out;
}
@ -322,12 +336,14 @@ x11grab_read_header(AVFormatContext *s1)
}
break;
default:
av_log(s1, AV_LOG_ERROR, "image depth %i not supported ... aborting\n", image->bits_per_pixel);
av_log(s1, AV_LOG_ERROR,
"image depth %i not supported ... aborting\n",
image->bits_per_pixel);
ret = AVERROR_PATCHWELCOME;
goto out;
}
x11grab->frame_size = x11grab->width * x11grab->height * image->bits_per_pixel/8;
x11grab->frame_size = x11grab->width * x11grab->height * image->bits_per_pixel / 8;
x11grab->dpy = dpy;
x11grab->time_base = av_inv_q(x11grab->framerate);
x11grab->time_frame = av_gettime() / av_q2d(x11grab->time_base);
@ -342,7 +358,7 @@ x11grab_read_header(AVFormatContext *s1)
st->codec->height = x11grab->height;
st->codec->pix_fmt = input_pixfmt;
st->codec->time_base = x11grab->time_base;
st->codec->bit_rate = x11grab->frame_size * 1/av_q2d(x11grab->time_base) * 8;
st->codec->bit_rate = x11grab->frame_size * 1 / av_q2d(x11grab->time_base) * 8;
out:
av_free(dpyname);
@ -356,8 +372,7 @@ out:
* @param s context used to retrieve original grabbing rectangle
* coordinates
*/
static void
paint_mouse_pointer(XImage *image, AVFormatContext *s1)
static void paint_mouse_pointer(XImage *image, AVFormatContext *s1)
{
struct x11grab *s = s1->priv_data;
int x_off = s->x_off;
@ -382,7 +397,7 @@ paint_mouse_pointer(XImage *image, AVFormatContext *s1)
if (image->bits_per_pixel != 24 && image->bits_per_pixel != 32)
return;
if(!s->c)
if (!s->c)
s->c = XCreateFontCursor(dpy, XC_left_ptr);
w = DefaultRootWindow(dpy);
attr.cursor = s->c;
@ -412,14 +427,14 @@ paint_mouse_pointer(XImage *image, AVFormatContext *s1)
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;
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;
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;
}
}
}
@ -428,7 +443,6 @@ paint_mouse_pointer(XImage *image, AVFormatContext *s1)
xcim = NULL;
}
/**
* Read new data in the image structure.
*
@ -439,16 +453,14 @@ paint_mouse_pointer(XImage *image, AVFormatContext *s1)
* @param y Top-Left grabbing rectangle vertical coordinate
* @return 0 if error, !0 if successful
*/
static int
xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
static int xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
{
xGetImageReply rep;
xGetImageReq *req;
long nbytes;
if (!image) {
if (!image)
return 0;
}
LockDisplay(dpy);
GetReq(GetImage, req);
@ -483,19 +495,16 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
* @param pkt Packet holding the brabbed frame
* @return frame size in bytes
*/
static int
x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{
struct x11grab *s = s1->priv_data;
Display *dpy = s->dpy;
XImage *image = s->image;
int x_off = s->x_off;
int y_off = s->y_off;
int follow_mouse = s->follow_mouse;
int screen;
Window root;
int follow_mouse = s->follow_mouse;
int64_t curtime, delay;
struct timespec ts;
@ -503,13 +512,12 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
s->time_frame += INT64_C(1000000);
/* wait based on the frame rate */
for(;;) {
for (;;) {
curtime = av_gettime();
delay = s->time_frame * av_q2d(s->time_base) - curtime;
if (delay <= 0) {
if (delay < INT64_C(-1000000) * av_q2d(s->time_base)) {
if (delay < INT64_C(-1000000) * av_q2d(s->time_base))
s->time_frame += INT64_C(1000000);
}
break;
}
ts.tv_sec = delay / 1000000;
@ -549,13 +557,13 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
} else {
// follow the mouse, but only move the grabbing region when mouse
// reaches within certain pixels to the edge.
if (pointer_x > x_off + s->width - follow_mouse) {
if (pointer_x > x_off + s->width - follow_mouse)
x_off += pointer_x - (x_off + s->width - follow_mouse);
} else if (pointer_x < x_off + follow_mouse)
else if (pointer_x < x_off + follow_mouse)
x_off -= (x_off + follow_mouse) - pointer_x;
if (pointer_y > y_off + s->height - follow_mouse) {
if (pointer_y > y_off + s->height - follow_mouse)
y_off += pointer_y - (y_off + s->height - follow_mouse);
} else if (pointer_y < y_off + follow_mouse)
else if (pointer_y < y_off + follow_mouse)
y_off -= (y_off + follow_mouse) - pointer_y;
}
// adjust grabbing region position if it goes out of screen.
@ -572,7 +580,9 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s->region_win) {
XEvent evt;
// clean up the events, and do the initinal draw or redraw.
for (evt.type = NoEventMask; XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask, &evt); );
for (evt.type = NoEventMask;
XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask, &evt);)
;
if (evt.type)
x11grab_draw_region_win(s);
} else {
@ -580,19 +590,16 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
}
}
if(s->use_shm) {
if (!XShmGetImage(dpy, root, image, x_off, y_off, AllPlanes)) {
av_log (s1, AV_LOG_INFO, "XShmGetImage() failed\n");
}
if (s->use_shm) {
if (!XShmGetImage(dpy, root, image, x_off, y_off, AllPlanes))
av_log(s1, AV_LOG_INFO, "XShmGetImage() failed\n");
} else {
if (!xget_zpixmap(dpy, root, image, x_off, y_off)) {
av_log (s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
}
if (!xget_zpixmap(dpy, root, image, x_off, y_off))
av_log(s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
}
if (s->draw_mouse) {
if (s->draw_mouse)
paint_mouse_pointer(image, s1);
}
return s->frame_size;
}
@ -603,8 +610,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
* @param s1 Context from avformat core
* @return 0 success, !0 failure
*/
static int
x11grab_read_close(AVFormatContext *s1)
static int x11grab_read_close(AVFormatContext *s1)
{
struct x11grab *x11grab = s1->priv_data;
@ -621,9 +627,8 @@ x11grab_read_close(AVFormatContext *s1)
x11grab->image = NULL;
}
if (x11grab->region_win) {
if (x11grab->region_win)
XDestroyWindow(x11grab->dpy, x11grab->region_win);
}
/* Free X11 display */
XCloseDisplay(x11grab->dpy);

Write Preview
Loading…
Cancel
Save