Commit 24f8961f authored by Diego Biurrun's avatar Diego Biurrun

x11grab: cosmetics: consistent naming for x11grab-related things

parent 755834e9
...@@ -1545,7 +1545,7 @@ sndio_outdev_deps="sndio_h" ...@@ -1545,7 +1545,7 @@ sndio_outdev_deps="sndio_h"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32" vfwcap_indev_extralibs="-lavicap32"
x11_grab_device_indev_deps="x11grab XShmCreateImage" x11grab_indev_deps="x11grab XShmCreateImage"
# protocols # protocols
ffrtmpcrypt_protocol_deps="!librtmp_protocol" ffrtmpcrypt_protocol_deps="!librtmp_protocol"
......
...@@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o ...@@ -23,7 +23,7 @@ OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o
OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o
# external libraries # external libraries
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
......
...@@ -49,7 +49,7 @@ void avdevice_register_all(void) ...@@ -49,7 +49,7 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INOUTDEV (SNDIO, sndio);
REGISTER_INDEV (V4L2, v4l2); REGISTER_INDEV (V4L2, v4l2);
REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (VFWCAP, vfwcap);
REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); REGISTER_INDEV (X11GRAB, x11grab);
/* external libraries */ /* external libraries */
REGISTER_INDEV (LIBCDIO, libcdio); REGISTER_INDEV (LIBCDIO, libcdio);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own
* I/O functions). The filename passed to avformat_open_input() often does not * I/O functions). The filename passed to avformat_open_input() often does not
* refer to an actually existing file, but has some special device-specific * refer to an actually existing file, but has some special device-specific
* meaning - e.g. for the x11grab device it is the display name. * meaning - e.g. for x11grab it is the display name.
* *
* To use libavdevice, simply call avdevice_register_all() to register all * To use libavdevice, simply call avdevice_register_all() to register all
* compiled muxers and demuxers. They all use standard libavformat API. * compiled muxers and demuxers. They all use standard libavformat API.
......
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
/** /**
* X11 Device Demuxer context * X11 Device Demuxer context
*/ */
struct x11_grab 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 */
AVRational time_base; /**< Time base */ AVRational time_base; /**< Time base */
...@@ -85,10 +84,10 @@ struct x11_grab ...@@ -85,10 +84,10 @@ struct x11_grab
/** /**
* Draw grabbing region window * Draw grabbing region window
* *
* @param s x11_grab context * @param s x11grab context
*/ */
static void static void
x11grab_draw_region_win(struct x11_grab *s) x11grab_draw_region_win(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
int screen; int screen;
...@@ -110,10 +109,10 @@ x11grab_draw_region_win(struct x11_grab *s) ...@@ -110,10 +109,10 @@ x11grab_draw_region_win(struct x11_grab *s)
/** /**
* Initialize grabbing region window * Initialize grabbing region window
* *
* @param s x11_grab context * @param s x11grab context
*/ */
static void static void
x11grab_region_win_init(struct x11_grab *s) x11grab_region_win_init(struct x11grab *s)
{ {
Display *dpy = s->dpy; Display *dpy = s->dpy;
int screen; int screen;
...@@ -155,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s) ...@@ -155,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s)
static int static int
x11grab_read_header(AVFormatContext *s1) x11grab_read_header(AVFormatContext *s1)
{ {
struct x11_grab *x11grab = s1->priv_data; struct x11grab *x11grab = s1->priv_data;
Display *dpy; Display *dpy;
AVStream *st = NULL; AVStream *st = NULL;
enum PixelFormat input_pixfmt; enum PixelFormat input_pixfmt;
...@@ -334,7 +333,7 @@ out: ...@@ -334,7 +333,7 @@ out:
* coordinates * coordinates
*/ */
static void static void
paint_mouse_pointer(XImage *image, struct x11_grab *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;
...@@ -448,7 +447,7 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y) ...@@ -448,7 +447,7 @@ xget_zpixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
static int static int
x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
{ {
struct x11_grab *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;
...@@ -558,7 +557,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -558,7 +557,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
static int static int
x11grab_read_close(AVFormatContext *s1) x11grab_read_close(AVFormatContext *s1)
{ {
struct x11_grab *x11grab = s1->priv_data; struct x11grab *x11grab = s1->priv_data;
/* Detach cleanly from shared mem */ /* Detach cleanly from shared mem */
if (x11grab->use_shm) { if (x11grab->use_shm) {
...@@ -582,7 +581,7 @@ x11grab_read_close(AVFormatContext *s1) ...@@ -582,7 +581,7 @@ x11grab_read_close(AVFormatContext *s1)
return 0; return 0;
} }
#define OFFSET(x) offsetof(struct x11_grab, x) #define OFFSET(x) offsetof(struct x11grab, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = "vga"}, 0, 0, DEC }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = "vga"}, 0, 0, DEC },
...@@ -603,10 +602,10 @@ static const AVClass x11_class = { ...@@ -603,10 +602,10 @@ static const AVClass x11_class = {
}; };
/** x11 grabber device demuxer declaration */ /** x11 grabber device demuxer declaration */
AVInputFormat ff_x11_grab_device_demuxer = { AVInputFormat ff_x11grab_demuxer = {
.name = "x11grab", .name = "x11grab",
.long_name = NULL_IF_CONFIG_SMALL("X11grab"), .long_name = NULL_IF_CONFIG_SMALL("X11grab"),
.priv_data_size = sizeof(struct x11_grab), .priv_data_size = sizeof(struct x11grab),
.read_header = x11grab_read_header, .read_header = x11grab_read_header,
.read_packet = x11grab_read_packet, .read_packet = x11grab_read_packet,
.read_close = x11grab_read_close, .read_close = x11grab_read_close,
......
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