Commit 0cd4faf9 authored by Panagiotis Issaris's avatar Panagiotis Issaris
Browse files

Allow provision of displaynumber, screennumber, x-offset and y-offset parameters

to the x11grab device.

Originally committed as revision 7320 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 162b9835
......@@ -50,6 +50,13 @@ ffmpeg -f x11grab -vd x11:0.0 /tmp/out.mpg
0.0 is display.screen number of your X11 server, same as
the DISPLAY environment variable.
@example
ffmpeg -f x11grab -vd x11:0.0+10,20 /tmp/out.mpg
@end example
0.0 is display.screen number of your X11 server, same as the DISPLAY environment
variable. 10 is the x-offset and 20 the y-offset for the grabbing.
@section Video and Audio file format conversion
* FFmpeg can use any supported file format and protocol as input:
......
......@@ -94,20 +94,33 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
int x_off = 0;
int y_off = 0;
int use_shm;
char *param, *offset;
dpy = XOpenDisplay(NULL);
if(!dpy) {
av_free(st);
if (!ap->device) {
av_log(s1, AV_LOG_ERROR, "AVParameters don't specify any device. Use -vd.\n");
return AVERROR_IO;
}
if (!ap->device) {
av_log(s1, AV_LOG_ERROR, "AVParameters don't specify any device. Use -vd.\n");
param = strchr(ap->device, ':');
if (!param) {
av_free(st);
return AVERROR_IO;
}
sscanf(ap->device, "x11:%d,%d", &x_off, &y_off);
av_log(s1, AV_LOG_INFO, "device: %s -> x: %d y: %d width: %d height: %d\n", ap->device, x_off, y_off, ap->width, ap->height);
param = av_strdup(param);
offset = strchr(param, '+');
if (offset) {
sscanf(offset, "%d,%d", &x_off, &y_off);
*offset= 0;
}
av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n", ap->device, param, x_off, y_off, ap->width, ap->height);
dpy = XOpenDisplay(param);
if(!dpy) {
av_log(s1, AV_LOG_ERROR, "Could not open X display.\n");
return AVERROR_IO;
}
if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
av_log(s1, AV_LOG_ERROR, "AVParameters don't have any video size. Use -s.\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment