mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/v4l2/: Fix compilation with newer GIT kernels that deprecated

Browse source 
Original commit message from CVS:
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.
This commit is contained in:
Bastien Nocera 2008-06-09 08:42:49 +00:00 committed by Sebastian Dröge
parent ec7e0e7d48
commit d4e7ab0e8c
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-06-09 Sebastian Dröge <slomo@circular-chaos.org>
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> 2008-06-07 Tim-Philipp Müller <tim.muller at collabora co uk>
* configure.ac: * configure.ac:

8
sys/v4l2/gstv4l2vidorient.c
View file

@ -34,6 +34,14 @@
GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug); GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug);
#define GST_CAT_DEFAULT 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
#endif
void void
gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass) gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass)
{ {

21
sys/v4l2/v4l2_calls.c
View file

@ -45,6 +45,14 @@
#include "gstv4l2src.h" #include "gstv4l2src.h"
/* Those are ioctl calls */
#ifndef V4L2_CID_HCENTER
#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
#endif
#ifndef V4L2_CID_VCENTER
#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
#endif
GST_DEBUG_CATEGORY_EXTERN (v4l2_debug); GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
#define GST_CAT_DEFAULT v4l2_debug #define GST_CAT_DEFAULT v4l2_debug
@ -97,6 +105,7 @@ static gboolean
gst_v4l2_fill_lists (GstV4l2Object * v4l2object) gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
{ {
gint n; gint n;
GstElement *e; GstElement *e;
e = v4l2object->element; e = v4l2object->element;
@ -109,6 +118,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
for (n = 0;; n++) { for (n = 0;; n++) {
struct v4l2_input input = { 0, }; struct v4l2_input input = { 0, };
GstV4l2TunerChannel *v4l2channel; GstV4l2TunerChannel *v4l2channel;
GstTunerChannel *channel; GstTunerChannel *channel;
input.index = n; input.index = n;
@ -177,6 +187,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
for (n = 0;; n++) { for (n = 0;; n++) {
struct v4l2_standard standard = { 0, }; struct v4l2_standard standard = { 0, };
GstV4l2TunerNorm *v4l2norm; GstV4l2TunerNorm *v4l2norm;
GstTunerNorm *norm; GstTunerNorm *norm;
/* fill in defaults */ /* fill in defaults */
@ -216,6 +227,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
for (n = V4L2_CID_BASE;; n++) { for (n = V4L2_CID_BASE;; n++) {
struct v4l2_queryctrl control = { 0, }; struct v4l2_queryctrl control = { 0, };
GstV4l2ColorBalanceChannel *v4l2channel; GstV4l2ColorBalanceChannel *v4l2channel;
GstColorBalanceChannel *channel; GstColorBalanceChannel *channel;
/* when we reached the last official CID, continue with private CIDs */ /* when we reached the last official CID, continue with private CIDs */
@ -267,6 +279,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
case V4L2_CID_VFLIP: case V4L2_CID_VFLIP:
case V4L2_CID_HCENTER: case V4L2_CID_HCENTER:
case V4L2_CID_VCENTER: case V4L2_CID_VCENTER:
#ifdef V4L2_CID_PAN_RESET
case V4L2_CID_PAN_RESET:
#endif
#ifdef V4L2_CID_TILT_RESET
case V4L2_CID_TILT_RESET:
#endif
/* not handled here, handled by VideoOrientation interface */ /* not handled here, handled by VideoOrientation interface */
control.id++; control.id++;
break; break;
@ -297,6 +315,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
(currently none of base controls are of this type) */ (currently none of base controls are of this type) */
if (control.type == V4L2_CTRL_TYPE_MENU) { if (control.type == V4L2_CTRL_TYPE_MENU) {
struct v4l2_querymenu menu, *mptr; struct v4l2_querymenu menu, *mptr;
int i; int i;
menu.id = n; menu.id = n;
@ -557,6 +576,7 @@ gst_v4l2_get_frequency (GstV4l2Object * v4l2object,
gint tunernum, gulong * frequency) gint tunernum, gulong * frequency)
{ {
struct v4l2_frequency freq; struct v4l2_frequency freq;
GstTunerChannel *channel; GstTunerChannel *channel;
GST_DEBUG_OBJECT (v4l2object->element, "getting current tuner frequency"); GST_DEBUG_OBJECT (v4l2object->element, "getting current tuner frequency");
@ -595,6 +615,7 @@ gst_v4l2_set_frequency (GstV4l2Object * v4l2object,
gint tunernum, gulong frequency) gint tunernum, gulong frequency)
{ {
struct v4l2_frequency freq; struct v4l2_frequency freq;
GstTunerChannel *channel; GstTunerChannel *channel;
GST_DEBUG_OBJECT (v4l2object->element, GST_DEBUG_OBJECT (v4l2object->element,