summaryrefslogtreecommitdiff
path: root/camerasrc/src
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2018-01-11 18:15:39 +0100
committerSylwester Nawrocki <s.nawrocki@samsung.com>2018-01-12 11:16:43 +0100
commit462b47ff7ee881bd61bcfeb4389795609d867da5 (patch)
tree8c3d1440a6022741875070f8e02e60e114f8dc09 /camerasrc/src
parent3a1ab490ac3291cb2f46769ecda0b26271aed853 (diff)
downloadgst-plugins-camera-n4-462b47ff7ee881bd61bcfeb4389795609d867da5.tar.gz
gst-plugins-camera-n4-462b47ff7ee881bd61bcfeb4389795609d867da5.tar.bz2
gst-plugins-camera-n4-462b47ff7ee881bd61bcfeb4389795609d867da5.zip
Use V4L2 control ID definitions from kernel headersubmit/tizen/20180115.024317accepted/tizen/unified/20180115.074505
Use V4L2 control ID definitions from the kernel header rather than redefining control IDs locally. Change-Id: Id154b911857836e0b0fcec050de7b19f6db73597 Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Diffstat (limited to 'camerasrc/src')
-rw-r--r--camerasrc/src/camerasrc.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/camerasrc/src/camerasrc.c b/camerasrc/src/camerasrc.c
index b5163ca..42bf0fb 100644
--- a/camerasrc/src/camerasrc.c
+++ b/camerasrc/src/camerasrc.c
@@ -28,6 +28,7 @@
#include <exynos_drm.h>
#include <libdrm/drm.h>
#include <linux/v4l2-subdev.h>
+#include <linux/videodev2_exynos_camera.h>
#include <linux/fimc-is-metadata.h>
#include <stdbool.h>
@@ -57,32 +58,6 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-/* Extended CID */
-#ifndef V4L2_CID_FIMC_IS_BASE
-#define V4L2_CID_FIMC_IS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x1000)
-#endif
-#ifndef V4L2_CID_IS_S_STREAM
-#define V4L2_CID_IS_S_STREAM (V4L2_CID_FIMC_IS_BASE + 14)
-#endif
-#ifndef V4L2_CID_IS_FORCE_DONE
-#define V4L2_CID_IS_FORCE_DONE (V4L2_CID_FIMC_IS_BASE + 50)
-#endif
-#ifndef V4L2_CID_IS_SET_SETFILE
-#define V4L2_CID_IS_SET_SETFILE (V4L2_CID_FIMC_IS_BASE + 51)
-#endif
-#ifndef V4L2_CID_IS_S_BNS
-#define V4L2_CID_IS_S_BNS (V4L2_CID_FIMC_IS_BASE + 52)
-#endif
-#ifndef V4L2_CID_IS_COLOR_RANGE
-#define V4L2_CID_IS_COLOR_RANGE (V4L2_CID_FIMC_IS_BASE + 54)
-#endif
-#ifndef V4L2_CID_IS_MIN_TARGET_FPS
-#define V4L2_CID_IS_MIN_TARGET_FPS (V4L2_CID_FIMC_IS_BASE + 55)
-#endif
-#ifndef V4L2_CID_IS_MAX_TARGET_FPS
-#define V4L2_CID_IS_MAX_TARGET_FPS (V4L2_CID_FIMC_IS_BASE + 56)
-#endif
-
/* FIMC IS NUM */
#define FIMC_IS_VIDEO_3A0_NUM 10
#define FIMC_IS_VIDEO_3A0P_NUM 12