diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-docs.sgml | 1 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-sections.txt | 19 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2src.c | 2 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2src.h | 7 | ||||
| -rw-r--r-- | sys/v4l2/gstv4l2vidorient.c | 14 |
7 files changed, 51 insertions, 9 deletions
@@ -1,5 +1,19 @@ 2006-09-26 Wim Taymans <wim@fluendo.com> + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-bad-plugins-docs.sgml: + * docs/plugins/gst-plugins-bad-plugins-sections.txt: + Add v4l2 plugin to the docs. + + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read), + (gst_v4l2src_get_mmap), (gst_v4l2src_create): + * sys/v4l2/gstv4l2src.h: + * sys/v4l2/gstv4l2vidorient.c: + Fix docs. + Remove some more externs. + +2006-09-26 Wim Taymans <wim@fluendo.com> + * sys/v4l2/Makefile.am: Fix makefile, list libs in stack order. diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index e6120339..e7239d5d 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -91,7 +91,8 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/wavpack/gstwavpackdec.h \ $(top_srcdir)/ext/wavpack/gstwavpackenc.h \ $(top_srcdir)/ext/wavpack/gstwavpackparse.h \ - $(top_srcdir)/gst/videocrop/gstvideocrop.h + $(top_srcdir)/gst/videocrop/gstvideocrop.h \ + $(top_srcdir)/sys/v4l2/gstv4l2src.h # Images to copy into HTML directory. HTML_IMAGES = diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 70ceb92f..f382b66c 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -19,6 +19,7 @@ <xi:include href="xml/element-wavpackdec.xml" /> <xi:include href="xml/element-wavpackenc.xml" /> <xi:include href="xml/element-wavpackparse.xml" /> + <xi:include href="xml/element-v4l2src.xml" /> </chapter> <chapter> diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 8b0fad1b..f2b96546 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -15,6 +15,25 @@ GstTRMClass </SECTION> <SECTION> +<FILE>element-v4l2src</FILE> +GstV4l2Src +<TITLE>v4l2src</TITLE> +<SUBSECTION Standard> +GST_V4L2_MAX_BUFFERS +GST_V4L2_MIN_BUFFERS +GstV4l2BufferPool +GstV4l2Buffer +GstV4l2Src +GstV4l2SrcClass +GST_V4L2SRC +GST_IS_V4L2SRC +GST_TYPE_V4L2SRC +gst_v4l2src_get_type +GST_V4L2SRC_CLASS +GST_IS_V4L2SRC_CLASS +</SECTION> + +<SECTION> <FILE>element-videocrop</FILE> GstVideoCrop <TITLE>videocrop</TITLE> diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index dc1893a3..6281b188 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -22,7 +22,7 @@ */ /** - * SECTION:element-v4l2srcsrc + * SECTION:element-v4l2src * * <refsect2> * v4l2src can be used to capture video from v4l2 devices, like webcams and tv cards. diff --git a/sys/v4l2/gstv4l2src.h b/sys/v4l2/gstv4l2src.h index 21b290de..e8622646 100644 --- a/sys/v4l2/gstv4l2src.h +++ b/sys/v4l2/gstv4l2src.h @@ -68,10 +68,17 @@ struct _GstV4l2Buffer GstV4l2BufferPool *pool; }; +/** + * GstV4l2Src: + * @pushsrc: parent #GstPushSrc. + * + * Opaque object. + */ struct _GstV4l2Src { GstPushSrc pushsrc; + /*< private >*/ GstV4l2Object * v4l2object; /* pads */ diff --git a/sys/v4l2/gstv4l2vidorient.c b/sys/v4l2/gstv4l2vidorient.c index 8f9c91af..07ac412b 100644 --- a/sys/v4l2/gstv4l2vidorient.c +++ b/sys/v4l2/gstv4l2vidorient.c @@ -50,46 +50,46 @@ gst_v4l2_video_orientation_get_hflip (GstV4l2Object * v4l2object, return gst_v4l2_get_attribute (v4l2object, V4L2_CID_HFLIP, flip); } -extern gboolean +gboolean gst_v4l2_video_orientation_get_vflip (GstV4l2Object * v4l2object, gboolean * flip) { return gst_v4l2_get_attribute (v4l2object, V4L2_CID_VFLIP, flip); } -extern gboolean +gboolean gst_v4l2_video_orientation_get_hcenter (GstV4l2Object * v4l2object, gint * center) { return gst_v4l2_get_attribute (v4l2object, V4L2_CID_HCENTER, center); } -extern gboolean +gboolean gst_v4l2_video_orientation_get_vcenter (GstV4l2Object * v4l2object, gint * center) { return gst_v4l2_get_attribute (v4l2object, V4L2_CID_VCENTER, center); } -extern gboolean +gboolean gst_v4l2_video_orientation_set_hflip (GstV4l2Object * v4l2object, gboolean flip) { return gst_v4l2_set_attribute (v4l2object, V4L2_CID_HFLIP, flip); } -extern gboolean +gboolean gst_v4l2_video_orientation_set_vflip (GstV4l2Object * v4l2object, gboolean flip) { return gst_v4l2_set_attribute (v4l2object, V4L2_CID_VFLIP, flip); } -extern gboolean +gboolean gst_v4l2_video_orientation_set_hcenter (GstV4l2Object * v4l2object, gint center) { return gst_v4l2_set_attribute (v4l2object, V4L2_CID_HCENTER, center); } -extern gboolean +gboolean gst_v4l2_video_orientation_set_vcenter (GstV4l2Object * v4l2object, gint center) { return gst_v4l2_set_attribute (v4l2object, V4L2_CID_VCENTER, center); |