virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

x11grab: Small near-cosmetic refactorings

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

35
libavdevice/x11grab.c
View File

@@ -95,11 +95,9 @@ static void x11grab_draw_region_win(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
Window win = s->region_win; Window win = s->region_win;
int screen; int screen = DefaultScreen(dpy);
GC gc; GC gc = XCreateGC(dpy, win, 0, 0);
screen = DefaultScreen(dpy);
gc = XCreateGC(dpy, win, 0, 0);
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);
@@ -117,12 +115,10 @@ static void x11grab_draw_region_win(struct x11grab *s)
static void x11grab_region_win_init(struct x11grab *s) static void x11grab_region_win_init(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
int screen;
XSetWindowAttributes attribs;
XRectangle rect; XRectangle rect;
XSetWindowAttributes attribs = { .override_redirect = True };
int screen = DefaultScreen(dpy);
screen = DefaultScreen(dpy);
attribs.override_redirect = True;
s->region_win = XCreateWindow(dpy, RootWindow(dpy, screen), s->region_win = XCreateWindow(dpy, RootWindow(dpy, screen),
s->x_off - REGION_WIN_BORDER, s->x_off - REGION_WIN_BORDER,
s->y_off - REGION_WIN_BORDER, s->y_off - REGION_WIN_BORDER,
@@ -160,12 +156,8 @@ static int x11grab_read_header(AVFormatContext *s1)
AVStream *st = NULL; AVStream *st = NULL;
enum AVPixelFormat input_pixfmt; enum AVPixelFormat input_pixfmt;
XImage *image; XImage *image;
int x_off = 0; int x_off = 0, y_off = 0, ret = 0, screen, use_shm;
int y_off = 0;
int screen;
int use_shm;
char *param, *offset; char *param, *offset;
int ret = 0;
AVRational framerate; AVRational framerate;
param = av_strdup(s1->filename); param = av_strdup(s1->filename);
@@ -179,12 +171,15 @@ static int x11grab_read_header(AVFormatContext *s1)
*offset = 0; *offset = 0;
} }
if ((ret = av_parse_video_size(&x11grab->width, &x11grab->height, ret = av_parse_video_size(&x11grab->width, &x11grab->height,
x11grab->video_size)) < 0) { x11grab->video_size);
if (ret < 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) {
ret = av_parse_video_rate(&framerate, x11grab->framerate);
if (ret < 0) {
av_log(s1, AV_LOG_ERROR, "Could not parse framerate: %s.\n", av_log(s1, AV_LOG_ERROR, "Could not parse framerate: %s.\n",
x11grab->framerate); x11grab->framerate);
goto out; goto out;
@@ -531,10 +526,10 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s->show_region) { if (s->show_region) {
if (s->region_win) { if (s->region_win) {
XEvent evt; XEvent evt = { .type = NoEventMask };
// clean up the events, and do the initinal draw or redraw. // Clean up the events, and do the initial draw or redraw.
for (evt.type = NoEventMask; while (XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask,
XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask, &evt);) &evt))
; ;
if (evt.type) if (evt.type)
x11grab_draw_region_win(s); x11grab_draw_region_win(s);