From aa94247770732a40e46ab3d539dd9987062abef4 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 10 Oct 2003 12:47:42 +0000 Subject: Some interface implementations for video4linux/video4linux2 plugins: a Tuner interface, with which one can select inp... Original commit message from CVS: Some interface implementations for video4linux/video4linux2 plugins: * a Tuner interface, with which one can select inputs and stations. Audio work is underway here, but unfinished. * A Xoverlay interface with which one can do simple overlay. Similar to the API of the v4l/Xv XFree86 extension. Widget implementation for GTK-2.0 coming up in the sandbox. * Colorbalance - for adapting colors (brightness, contrast, etc.) - pretty basic and maybe somewhat overdesigned. But it'll do for now. Apart from these interfaces, there's also a loadable library 'xwindowlistener' that listenes to X for the movement of a window and the overlap of other windows. This is partly copied from xawtv (and thus partly GPL :(), but it's needed for the xoverlay interface implementation in the v4l/v4l2 elements. Lastly, some small changes to remove redundant properties from the v4l/v4l2 elements since these can be done much simpler. Comments appreciated! --- sys/v4l2/gstv4l2element.h | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'sys/v4l2/gstv4l2element.h') diff --git a/sys/v4l2/gstv4l2element.h b/sys/v4l2/gstv4l2element.h index 6d86d4a9..f6e19e7e 100644 --- a/sys/v4l2/gstv4l2element.h +++ b/sys/v4l2/gstv4l2element.h @@ -21,6 +21,7 @@ #define __GST_V4L2ELEMENT_H__ #include +#include /* Because of some really cool feature in video4linux1, also known as * 'not including sys/types.h and sys/time.h', we had to include it @@ -71,17 +72,16 @@ struct _GstV4l2Element { struct v4l2_capability vcap; /* the toys available to us */ - GList /*v4l2_input*/ *inputs, *input_names; - GList /*v4l2_output*/ *outputs, *output_names; - GList /*v4l2_enumstd*/ *norms, *norm_names; - GList /*v4l2_queryctrl*/ *controls, *control_specs; - GList /*GList:v4l2_querymenu*/ *menus; + GList *channels; + GList *norms; + GList *colors; + + /* X-overlay */ + GstXWindowListener *overlay; + XID xwindow_id; /* caching values */ - gint channel; - gint output; - gint norm; - gulong frequency; + gchar *display; }; struct _GstV4l2ElementClass { @@ -92,21 +92,6 @@ struct _GstV4l2ElementClass { const gchar *device); void (*close) (GstElement *element, const gchar *device); - - /* actions */ - gboolean (*set_videowindow) (GstElement *element, - gint x_offset, - gint y_offset, - gint height, - gint width, - struct v4l2_clip *clips, - gint num_clips); - gboolean (*get_attribute) (GstElement *element, - const gchar *attr_name, - int *value); - gboolean (*set_attribute) (GstElement *element, - const gchar *attr_name, - const int value); }; -- cgit v1.2.1