Use V4L2 control ID definitions from kernel header 58/166758/2 accepted/tizen/unified/20180115.074505 submit/tizen/20180115.024317
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Thu, 11 Jan 2018 17:15:39 +0000 (18:15 +0100)
committerSylwester Nawrocki <s.nawrocki@samsung.com>
Fri, 12 Jan 2018 10:16:43 +0000 (11:16 +0100)
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>
camerasrc/src/camerasrc.c

index b5163cac1cdbd7f1a3776070adfb4b41e83fcc1b..42bf0fbe81535535ccad9e1108bb556823a25640 100644 (file)
@@ -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>
 
 
 #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