aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-28 12:00:08 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 10:57:27 -0400
commita77b4fc0bc328b0989f83220aba1c268e087107f (patch)
tree5efdcb21658170fa63c534d596fcdcd27a18d87b /drivers/media/v4l2-core
parent59253f29c0f3a8b2f6e5108610037150acade9e9 (diff)
[media] v4l2-ctrls/v4l2-controls.h: add MD controls
Add the 'Detect' control class and the new motion detection controls. Those controls will be used by the solo6x10 and go7007 drivers. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r--drivers/media/v4l2-core/v4l2-ctrls.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 5aaf15e047c8..5c3b8de82e35 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -462,6 +462,13 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
462 "RGB full range (0-255)", 462 "RGB full range (0-255)",
463 NULL, 463 NULL,
464 }; 464 };
465 static const char * const detect_md_mode[] = {
466 "Disabled",
467 "Global",
468 "Threshold Grid",
469 "Region Grid",
470 NULL,
471 };
465 472
466 473
467 switch (id) { 474 switch (id) {
@@ -553,6 +560,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
553 case V4L2_CID_DV_TX_RGB_RANGE: 560 case V4L2_CID_DV_TX_RGB_RANGE:
554 case V4L2_CID_DV_RX_RGB_RANGE: 561 case V4L2_CID_DV_RX_RGB_RANGE:
555 return dv_rgb_range; 562 return dv_rgb_range;
563 case V4L2_CID_DETECT_MD_MODE:
564 return detect_md_mode;
556 565
557 default: 566 default:
558 return NULL; 567 return NULL;
@@ -874,6 +883,15 @@ const char *v4l2_ctrl_get_name(u32 id)
874 case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO: return "Bandwidth, Auto"; 883 case V4L2_CID_RF_TUNER_BANDWIDTH_AUTO: return "Bandwidth, Auto";
875 case V4L2_CID_RF_TUNER_BANDWIDTH: return "Bandwidth"; 884 case V4L2_CID_RF_TUNER_BANDWIDTH: return "Bandwidth";
876 case V4L2_CID_RF_TUNER_PLL_LOCK: return "PLL Lock"; 885 case V4L2_CID_RF_TUNER_PLL_LOCK: return "PLL Lock";
886
887 /* Detection controls */
888 /* Keep the order of the 'case's the same as in v4l2-controls.h! */
889 case V4L2_CID_DETECT_CLASS: return "Detection Controls";
890 case V4L2_CID_DETECT_MD_MODE: return "Motion Detection Mode";
891 case V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD: return "MD Global Threshold";
892 case V4L2_CID_DETECT_MD_THRESHOLD_GRID: return "MD Threshold Grid";
893 case V4L2_CID_DETECT_MD_REGION_GRID: return "MD Region Grid";
894
877 default: 895 default:
878 return NULL; 896 return NULL;
879 } 897 }
@@ -992,6 +1010,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
992 case V4L2_CID_TEST_PATTERN: 1010 case V4L2_CID_TEST_PATTERN:
993 case V4L2_CID_TUNE_DEEMPHASIS: 1011 case V4L2_CID_TUNE_DEEMPHASIS:
994 case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: 1012 case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL:
1013 case V4L2_CID_DETECT_MD_MODE:
995 *type = V4L2_CTRL_TYPE_MENU; 1014 *type = V4L2_CTRL_TYPE_MENU;
996 break; 1015 break;
997 case V4L2_CID_LINK_FREQ: 1016 case V4L2_CID_LINK_FREQ:
@@ -1018,6 +1037,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
1018 case V4L2_CID_DV_CLASS: 1037 case V4L2_CID_DV_CLASS:
1019 case V4L2_CID_FM_RX_CLASS: 1038 case V4L2_CID_FM_RX_CLASS:
1020 case V4L2_CID_RF_TUNER_CLASS: 1039 case V4L2_CID_RF_TUNER_CLASS:
1040 case V4L2_CID_DETECT_CLASS:
1021 *type = V4L2_CTRL_TYPE_CTRL_CLASS; 1041 *type = V4L2_CTRL_TYPE_CTRL_CLASS;
1022 /* You can neither read not write these */ 1042 /* You can neither read not write these */
1023 *flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY; 1043 *flags |= V4L2_CTRL_FLAG_READ_ONLY | V4L2_CTRL_FLAG_WRITE_ONLY;
@@ -1063,6 +1083,12 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
1063 *type = V4L2_CTRL_TYPE_INTEGER64; 1083 *type = V4L2_CTRL_TYPE_INTEGER64;
1064 *flags |= V4L2_CTRL_FLAG_READ_ONLY; 1084 *flags |= V4L2_CTRL_FLAG_READ_ONLY;
1065 break; 1085 break;
1086 case V4L2_CID_DETECT_MD_REGION_GRID:
1087 *type = V4L2_CTRL_TYPE_U8;
1088 break;
1089 case V4L2_CID_DETECT_MD_THRESHOLD_GRID:
1090 *type = V4L2_CTRL_TYPE_U16;
1091 break;
1066 default: 1092 default:
1067 *type = V4L2_CTRL_TYPE_INTEGER; 1093 *type = V4L2_CTRL_TYPE_INTEGER;
1068 break; 1094 break;
@@ -1103,6 +1129,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
1103 case V4L2_CID_RF_TUNER_MIXER_GAIN: 1129 case V4L2_CID_RF_TUNER_MIXER_GAIN:
1104 case V4L2_CID_RF_TUNER_IF_GAIN: 1130 case V4L2_CID_RF_TUNER_IF_GAIN:
1105 case V4L2_CID_RF_TUNER_BANDWIDTH: 1131 case V4L2_CID_RF_TUNER_BANDWIDTH:
1132 case V4L2_CID_DETECT_MD_GLOBAL_THRESHOLD:
1106 *flags |= V4L2_CTRL_FLAG_SLIDER; 1133 *flags |= V4L2_CTRL_FLAG_SLIDER;
1107 break; 1134 break;
1108 case V4L2_CID_PAN_RELATIVE: 1135 case V4L2_CID_PAN_RELATIVE: