virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

x11grab: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato
2014-08-27 04:43:47 +02:00
committed by Diego Biurrun
parent 8d27bf1cff
commit f07a4290a0
1 changed files with 144 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
libavdevice/x11grab.c
View File

@@ -37,26 +37,29 @@
*/ */
#include "config.h" #include "config.h"
#include "libavformat/avformat.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 <time.h>
#include <sys/shm.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/Xutil.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/shape.h>
* X11 Device Demuxer context #include <X11/extensions/Xfixes.h>
*/ #include <X11/extensions/XShm.h>
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
/** X11 device demuxer context */
struct x11grab { struct x11grab {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
int frame_size; /**< Size in bytes of a grabbed frame */ int frame_size; /**< Size in bytes of a grabbed frame */
@@ -82,17 +85,17 @@ struct x11grab {
}; };
#define REGION_WIN_BORDER 3 #define REGION_WIN_BORDER 3
/** /**
* Draw grabbing region window * Draw grabbing region window
* *
* @param s x11grab context * @param s x11grab context
*/ */
static void static void x11grab_draw_region_win(struct x11grab *s)
x11grab_draw_region_win(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
int screen;
Window win = s->region_win; Window win = s->region_win;
int screen;
GC gc; GC gc;
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
@@ -100,8 +103,7 @@ x11grab_draw_region_win(struct x11grab *s)
XSetForeground(dpy, gc, WhitePixel(dpy, screen)); XSetForeground(dpy, gc, WhitePixel(dpy, screen));
XSetBackground(dpy, gc, BlackPixel(dpy, screen)); XSetBackground(dpy, gc, BlackPixel(dpy, screen));
XSetLineAttributes(dpy, gc, REGION_WIN_BORDER, LineDoubleDash, 0, 0); XSetLineAttributes(dpy, gc, REGION_WIN_BORDER, LineDoubleDash, 0, 0);
XDrawRectangle(dpy, win, gc, XDrawRectangle(dpy, win, gc, 1, 1,
1, 1,
(s->width + REGION_WIN_BORDER * 2) - 1 * 2 - 1, (s->width + REGION_WIN_BORDER * 2) - 1 * 2 - 1,
(s->height + REGION_WIN_BORDER * 2) - 1 * 2 - 1); (s->height + REGION_WIN_BORDER * 2) - 1 * 2 - 1);
XFreeGC(dpy, gc); XFreeGC(dpy, gc);
@@ -112,8 +114,7 @@ x11grab_draw_region_win(struct x11grab *s)
* *
* @param s x11grab context * @param s x11grab context
*/ */
static void static void x11grab_region_win_init(struct x11grab *s)
x11grab_region_win_init(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
int screen; int screen;
@@ -152,8 +153,7 @@ x11grab_region_win_init(struct x11grab *s)
* <li>0 success</li> * <li>0 success</li>
* </ul> * </ul>
*/ */
static int static int x11grab_read_header(AVFormatContext *s1)
x11grab_read_header(AVFormatContext *s1)
{ {
struct x11grab *x11grab = s1->priv_data; struct x11grab *x11grab = s1->priv_data;
Display *dpy; Display *dpy;
@@ -179,15 +179,18 @@ x11grab_read_header(AVFormatContext *s1)
*offset = 0; *offset = 0;
} }
if ((ret = av_parse_video_size(&x11grab->width, &x11grab->height, x11grab->video_size)) < 0) { if ((ret = av_parse_video_size(&x11grab->width, &x11grab->height,
x11grab->video_size)) < 0) {
av_log(s1, AV_LOG_ERROR, "Couldn't parse video size.\n"); av_log(s1, AV_LOG_ERROR, "Couldn't parse video size.\n");
goto out; goto out;
} }
if ((ret = av_parse_video_rate(&framerate, x11grab->framerate)) < 0) { if ((ret = av_parse_video_rate(&framerate, x11grab->framerate)) < 0) {
av_log(s1, AV_LOG_ERROR, "Could not parse framerate: %s.\n", x11grab->framerate); av_log(s1, AV_LOG_ERROR, "Could not parse framerate: %s.\n",
x11grab->framerate);
goto out; goto out;
} }
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, param, x_off, y_off, x11grab->width, x11grab->height); s1->filename, param, x_off, y_off, x11grab->width, x11grab->height);
dpy = XOpenDisplay(param); dpy = XOpenDisplay(param);
@@ -212,16 +215,20 @@ x11grab_read_header(AVFormatContext *s1)
screen_w = DisplayWidth(dpy, screen); screen_w = DisplayWidth(dpy, screen);
screen_h = DisplayHeight(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; x_off -= x11grab->width / 2;
y_off -= x11grab->height / 2; y_off -= x11grab->height / 2;
x_off = FFMIN(FFMAX(x_off, 0), screen_w - x11grab->width); x_off = FFMIN(FFMAX(x_off, 0), screen_w - x11grab->width);
y_off = FFMIN(FFMAX(y_off, 0), screen_h - x11grab->height); 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);
} }
use_shm = XShmQueryExtension(dpy); 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); int scr = XDefaultScreen(dpy);
@@ -273,8 +280,12 @@ x11grab_read_header(AVFormatContext *s1)
av_log(s1, AV_LOG_DEBUG, "16 bit RGB555\n"); av_log(s1, AV_LOG_DEBUG, "16 bit RGB555\n");
input_pixfmt = AV_PIX_FMT_RGB555; input_pixfmt = AV_PIX_FMT_RGB555;
} else { } 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,
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); "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(EIO); ret = AVERROR(EIO);
goto out; goto out;
} }
@@ -289,8 +300,12 @@ x11grab_read_header(AVFormatContext *s1)
image->blue_mask == 0xff0000) { image->blue_mask == 0xff0000) {
input_pixfmt = AV_PIX_FMT_RGB24; input_pixfmt = AV_PIX_FMT_RGB24;
} else { } 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,
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); "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(EIO); ret = AVERROR(EIO);
goto out; goto out;
} }
@@ -299,7 +314,9 @@ x11grab_read_header(AVFormatContext *s1)
input_pixfmt = AV_PIX_FMT_RGB32; input_pixfmt = AV_PIX_FMT_RGB32;
break; break;
default: 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(EINVAL); ret = AVERROR(EINVAL);
goto out; goto out;
} }
@@ -333,8 +350,7 @@ out:
* @param s context used to retrieve original grabbing rectangle * @param s context used to retrieve original grabbing rectangle
* coordinates * coordinates
*/ */
static void static void paint_mouse_pointer(XImage *image, struct x11grab *s)
paint_mouse_pointer(XImage *image, struct x11grab *s)
{ {
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
@@ -390,7 +406,6 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
xcim = NULL; xcim = NULL;
} }
/** /**
* Read new data in the image structure. * Read new data in the image structure.
* *
@@ -401,16 +416,14 @@ paint_mouse_pointer(XImage *image, struct x11grab *s)
* @param y Top-Left grabbing rectangle vertical coordinate * @param y Top-Left grabbing rectangle vertical coordinate
* @return 0 if error, !0 if successful * @return 0 if error, !0 if successful
*/ */
static int static int xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
{ {
xGetImageReply rep; xGetImageReply rep;
xGetImageReq *req; xGetImageReq *req;
long nbytes; long nbytes;
if (!image) { if (!image)
return 0; return 0;
}
LockDisplay(dpy); LockDisplay(dpy);
GetReq(GetImage, req); GetReq(GetImage, req);
@@ -445,19 +458,16 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
* @param pkt Packet holding the brabbed frame * @param pkt Packet holding the brabbed frame
* @return frame size in bytes * @return frame size in bytes
*/ */
static int static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{ {
struct x11grab *s = s1->priv_data; struct x11grab *s = s1->priv_data;
Display *dpy = s->dpy; Display *dpy = s->dpy;
XImage *image = s->image; XImage *image = s->image;
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
int follow_mouse = s->follow_mouse;
int screen; int screen;
Window root; Window root;
int follow_mouse = s->follow_mouse;
int64_t curtime, delay; int64_t curtime, delay;
struct timespec ts; struct timespec ts;
@@ -469,9 +479,8 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
curtime = av_gettime(); curtime = av_gettime();
delay = s->time_frame * av_q2d(s->time_base) - curtime; delay = s->time_frame * av_q2d(s->time_base) - curtime;
if (delay <= 0) { 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); s->time_frame += INT64_C(1000000);
}
break; break;
} }
ts.tv_sec = delay / 1000000; ts.tv_sec = delay / 1000000;
@@ -501,13 +510,13 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
} else { } else {
// follow the mouse, but only move the grabbing region when mouse // follow the mouse, but only move the grabbing region when mouse
// reaches within certain pixels to the edge. // 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); 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; 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); 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; y_off -= (y_off + follow_mouse) - pointer_y;
} }
// adjust grabbing region position if it goes out of screen. // adjust grabbing region position if it goes out of screen.
@@ -524,7 +533,9 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s->region_win) { if (s->region_win) {
XEvent evt; XEvent evt;
// clean up the events, and do the initinal draw or redraw. // 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) if (evt.type)
x11grab_draw_region_win(s); x11grab_draw_region_win(s);
} else { } else {
@@ -533,18 +544,15 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
} }
if (s->use_shm) { if (s->use_shm) {
if (!XShmGetImage(dpy, root, image, x_off, y_off, AllPlanes)) { if (!XShmGetImage(dpy, root, image, x_off, y_off, AllPlanes))
av_log(s1, AV_LOG_INFO, "XShmGetImage() failed\n"); av_log(s1, AV_LOG_INFO, "XShmGetImage() failed\n");
}
} else { } else {
if (!xget_zpixmap(dpy, root, image, x_off, y_off)) { if (!xget_zpixmap(dpy, root, image, x_off, y_off))
av_log(s1, AV_LOG_INFO, "XGetZPixmap() failed\n"); av_log(s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
} }
}
if (s->draw_mouse) { if (s->draw_mouse)
paint_mouse_pointer(image, s); paint_mouse_pointer(image, s);
}
return s->frame_size; return s->frame_size;
} }
@@ -555,8 +563,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
* @param s1 Context from avformat core * @param s1 Context from avformat core
* @return 0 success, !0 failure * @return 0 success, !0 failure
*/ */
static int static int x11grab_read_close(AVFormatContext *s1)
x11grab_read_close(AVFormatContext *s1)
{ {
struct x11grab *x11grab = s1->priv_data; struct x11grab *x11grab = s1->priv_data;
@@ -573,9 +580,8 @@ x11grab_read_close(AVFormatContext *s1)
x11grab->image = NULL; x11grab->image = NULL;
} }
if (x11grab->region_win) { if (x11grab->region_win)
XDestroyWindow(x11grab->dpy, x11grab->region_win); XDestroyWindow(x11grab->dpy, x11grab->region_win);
}
/* Free X11 display */ /* Free X11 display */
XCloseDisplay(x11grab->dpy); XCloseDisplay(x11grab->dpy);