diff options
-rw-r--r-- | recipes-multimedia/gstreamer/gst-fsl-plugin.inc | 3 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gst-fsl-plugin/Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch | 69 |
2 files changed, 71 insertions, 1 deletions
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc index dca9209..f8685bc 100644 --- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc | |||
@@ -19,7 +19,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | |||
19 | S = "${WORKDIR}/gst-fsl-plugins-${PV}" | 19 | S = "${WORKDIR}/gst-fsl-plugins-${PV}" |
20 | 20 | ||
21 | SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz \ | 21 | SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz \ |
22 | file://build-Fix-out-of-tree-build.patch" | 22 | file://build-Fix-out-of-tree-build.patch \ |
23 | file://Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch" | ||
23 | 24 | ||
24 | inherit autotools pkgconfig | 25 | inherit autotools pkgconfig |
25 | 26 | ||
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin/Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch b/recipes-multimedia/gstreamer/gst-fsl-plugin/Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch new file mode 100644 index 0000000..5635275 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst-fsl-plugin/Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From ce90794a3458af0aed43b8570cf44cd87900185d Mon Sep 17 00:00:00 2001 | ||
2 | From: Gary Bisson <bisson.gary@gmail.com> | ||
3 | Date: Fri, 25 Jul 2014 16:44:53 -0700 | ||
4 | Subject: [PATCH] Remove use of obsolete VIDIOC_DBG_G_CHIP_IDENT | ||
5 | |||
6 | This ioctl should never be used in application as | ||
7 | stated in videodev2.h header. | ||
8 | Moreover, its use in this plugin was very limited. | ||
9 | |||
10 | Signed-off-by: Gary Bisson <bisson.gary@gmail.com> | ||
11 | --- | ||
12 | src/misc/tvsrc/src/mfw_gst_tvsrc.c | 8 -------- | ||
13 | src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 7 ------- | ||
14 | 2 files changed, 15 deletions(-) | ||
15 | |||
16 | diff --git a/src/misc/tvsrc/src/mfw_gst_tvsrc.c b/src/misc/tvsrc/src/mfw_gst_tvsrc.c | ||
17 | index 67e0cd2..f495b6f 100755 | ||
18 | --- a/src/misc/tvsrc/src/mfw_gst_tvsrc.c | ||
19 | +++ b/src/misc/tvsrc/src/mfw_gst_tvsrc.c | ||
20 | @@ -450,7 +450,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) | ||
21 | struct v4l2_format fmt; | ||
22 | struct v4l2_control ctrl; | ||
23 | struct v4l2_streamparm parm; | ||
24 | - struct v4l2_dbg_chip_ident chip; | ||
25 | gint fd_v4l = 0; | ||
26 | struct v4l2_mxc_offset off; | ||
27 | gint in_width = 0, in_height = 0; | ||
28 | @@ -461,13 +460,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) | ||
29 | return 0; | ||
30 | } | ||
31 | |||
32 | - if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { | ||
33 | - g_print ("VIDIOC_DBG_G_CHIP_IDENT failed.\n"); | ||
34 | - } else | ||
35 | - g_print ("sensor chip is %s\n", chip.match.name); | ||
36 | - | ||
37 | - | ||
38 | - | ||
39 | if (ioctl (fd_v4l, VIDIOC_G_STD, &id) < 0) { | ||
40 | g_print ("VIDIOC_G_STD failed\n"); | ||
41 | close (fd_v4l); | ||
42 | diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c | ||
43 | index 2c2e838..85e7ff0 100755 | ||
44 | --- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c | ||
45 | +++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c | ||
46 | @@ -464,7 +464,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) | ||
47 | struct v4l2_format fmt = {0}; | ||
48 | struct v4l2_control ctrl = {0}; | ||
49 | struct v4l2_streamparm parm = {0}; | ||
50 | - struct v4l2_dbg_chip_ident chip = {0}; | ||
51 | struct v4l2_frmsizeenum fszenum = {0}; | ||
52 | gint input; | ||
53 | gint fd_v4l = 0; | ||
54 | @@ -476,12 +475,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) | ||
55 | return 0; | ||
56 | } | ||
57 | |||
58 | - if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { | ||
59 | - GST_ERROR ("VIDIOC_DBG_G_CHIP_IDENT failed."); | ||
60 | - } else | ||
61 | - GST_INFO ("sensor chip is %s", chip.match.name); | ||
62 | - | ||
63 | - | ||
64 | if (v4l_src->crop_pixel) { | ||
65 | in_width = v4l_src->capture_width - (2 * v4l_src->crop_pixel); | ||
66 | in_height = v4l_src->capture_height - (2 * v4l_src->crop_pixel); | ||
67 | -- | ||
68 | 2.0.1 | ||
69 | |||