From: <sl...@ke...> - 2008-06-09 08:42:55
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: slomo Date: Mon Jun 09 2008 08:43:03 UTC Log message: Patch by: Bastien Nocera <hadess at hadess dot net> * sys/v4l2/gstv4l2vidorient.c: * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): Fix compilation with newer GIT kernels that deprecated V4L2_CID_HCENTER and V4L2_CID_VCENTER. Fixes bug #536317. Modified files: . : ChangeLog sys/v4l2 : gstv4l2vidorient.c v4l2_calls.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3518&r2=1.3519 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2vidorient.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/sys/v4l2/v4l2_calls.c.diff?r1=1.44&r2=1.45 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3518 retrieving revision 1.3519 diff -u -d -r1.3518 -r1.3519 --- ChangeLog 7 Jun 2008 18:48:51 -0000 1.3518 +++ ChangeLog 9 Jun 2008 08:42:47 -0000 1.3519 @@ -1,3 +1,12 @@ +2008-06-09 Sebastian Dröge <sl...@ci...> + + Patch by: Bastien Nocera <hadess at hadess dot net> + * sys/v4l2/gstv4l2vidorient.c: + * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): + Fix compilation with newer GIT kernels that deprecated + V4L2_CID_HCENTER and V4L2_CID_VCENTER. Fixes bug #536317. 2008-06-07 Tim-Philipp Müller <tim.muller at collabora co uk> * configure.ac: Index: gstv4l2vidorient.c RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2vidorient.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gstv4l2vidorient.c 26 Sep 2006 14:17:54 -0000 1.2 +++ gstv4l2vidorient.c 9 Jun 2008 08:42:48 -0000 1.3 @@ -34,6 +34,14 @@ GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug); #define GST_CAT_DEFAULT v4l2vo_debug +/* Those are deprecated calls that have been replaced */ +#ifndef V4L2_CID_HCENTER +#define V4L2_CID_HCENTER V4L2_CID_PAN_RESET +#endif +#ifndef V4L2_CID_VCENTER +#define V4L2_CID_VCENTER V4L2_CID_TILT_RESET void gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass) { Index: v4l2_calls.c RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/v4l2_calls.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- v4l2_calls.c 31 Jan 2008 16:12:28 -0000 1.44 +++ v4l2_calls.c 9 Jun 2008 08:42:49 -0000 1.45 @@ -45,6 +45,14 @@ #include "gstv4l2src.h" +/* Those are ioctl calls */ +#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED +#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); #define GST_CAT_DEFAULT v4l2_debug @@ -97,6 +105,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) gint n; GstElement *e; e = v4l2object->element; @@ -109,6 +118,7 @@ for (n = 0;; n++) { struct v4l2_input input = { 0, }; GstV4l2TunerChannel *v4l2channel; GstTunerChannel *channel; input.index = n; @@ -177,6 +187,7 @@ struct v4l2_standard standard = { 0, }; GstV4l2TunerNorm *v4l2norm; GstTunerNorm *norm; /* fill in defaults */ @@ -216,6 +227,7 @@ for (n = V4L2_CID_BASE;; n++) { struct v4l2_queryctrl control = { 0, }; GstV4l2ColorBalanceChannel *v4l2channel; GstColorBalanceChannel *channel; /* when we reached the last official CID, continue with private CIDs */ @@ -267,6 +279,12 @@ case V4L2_CID_VFLIP: case V4L2_CID_HCENTER: case V4L2_CID_VCENTER: +#ifdef V4L2_CID_PAN_RESET + case V4L2_CID_PAN_RESET: +#ifdef V4L2_CID_TILT_RESET + case V4L2_CID_TILT_RESET: /* not handled here, handled by VideoOrientation interface */ control.id++; break; @@ -297,6 +315,7 @@ (currently none of base controls are of this type) */ if (control.type == V4L2_CTRL_TYPE_MENU) { struct v4l2_querymenu menu, *mptr; int i; menu.id = n; @@ -557,6 +576,7 @@ gint tunernum, gulong * frequency) struct v4l2_frequency freq; GstTunerChannel *channel; GST_DEBUG_OBJECT (v4l2object->element, "getting current tuner frequency"); @@ -595,6 +615,7 @@ gint tunernum, gulong frequency) GST_DEBUG_OBJECT (v4l2object->element, |