From patchwork Tue Mar 22 08:51:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kim, HeungJun" X-Patchwork-Id: 652031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2M8rMfi015582 for ; Tue, 22 Mar 2011 08:53:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123Ab1CVIxU (ORCPT ); Tue, 22 Mar 2011 04:53:20 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:49843 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375Ab1CVIxT (ORCPT ); Tue, 22 Mar 2011 04:53:19 -0400 Received: from epmmp1 (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LIG001C2B9NKX10@mailout3.samsung.com> for linux-media@vger.kernel.org; Tue, 22 Mar 2011 17:51:23 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LIG003AGB9ND5@mmp1.samsung.com> for linux-media@vger.kernel.org; Tue, 22 Mar 2011 17:51:23 +0900 (KST) Received: from localhost.localdomain ([165.213.219.119]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Tue, 22 Mar 2011 17:51:23 +0900 Date: Tue, 22 Mar 2011 17:51:20 +0900 From: "Kim, Heungjun" Subject: [RFC PATCH v3 2/2] v4l2-ctrls: update auto focus mode documentation In-reply-to: <4D886294.5060300@samsung.com> To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, s.nawrocki@samsung.com, kyungmin.park@samsung.com, "Kim, Heungjun" Message-id: <1300783880-15157-2-git-send-email-riverful.kim@samsung.com> X-Mailer: git-send-email 1.7.0.4 Content-transfer-encoding: 7BIT References: <4D886294.5060300@samsung.com> X-OriginalArrivalTime: 22 Mar 2011 08:51:23.0567 (UTC) FILETIME=[5256FBF0:01CBE86E] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 22 Mar 2011 08:53:22 +0000 (UTC) diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml index 2fae3e8..b940e21 100644 --- a/Documentation/DocBook/v4l/controls.xml +++ b/Documentation/DocBook/v4l/controls.xml @@ -1860,6 +1860,73 @@ it one step further. This is a write-only control. + + V4L2_CID_FOCUS_AUTO_MODE  + enum v4l2_focus_auto_mode_type + Enables setting modes of +auto focus. The focus has 5 kinds of mode, and each enumerations express +current auto focus mode in which the camera is. In the case of +V4L2_FOCUS_AUTO_RECTANGLE, this control id can be clustered with +4 control id which means focusing spot expressed by 4 point of rectangle. + + + + + + + V4L2_FOCUS_AUTO_NORMAL  + Normal mode Auto focus, single shot. + + + V4L2_FOCUS_AUTO_MACRO  + Macro mode Auto focus, single shot. + + + V4L2_FOCUS_AUTO_CONTINUOUS  + Continuous mode Auto focus, continuous shot. + + + V4L2_FOCUS_AUTO_FACE_DETECTION  + Face detection mode Auto focus, single shot. + + + V4L2_FOCUS_AUTO_RECTANGLE  + Rectangle mode Auto focus, single shot. + + + + + + + + V4L2_CID_FOCUS_AUTO_RECTANGLE_LEFT  + integer + This control means the left +side's point of the rectangle expressing focusing spot. + + + + V4L2_CID_FOCUS_AUTO_RECTANGLE_TOP  + integer + This control means the top +side's point of the rectangle expressing focusing spot. + + + + V4L2_CID_FOCUS_AUTO_RECTANGLE_WIDTH  + integer + This control means the width +length of the rectangle expressing focusing spot. + + + + V4L2_CID_FOCUS_AUTO_RECTANGLE_HEIGHT  + integer + This control means the height +length of the rectangle expressing focusing spot. + + + V4L2_CID_PRIVACY  boolean diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 2b796a2..6bb67a6 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml @@ -1385,6 +1385,14 @@ enum v4l2_exposure_auto_type { #define V4L2_CID_IRIS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+17) #define V4L2_CID_IRIS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+18) +enum v4l2_focus_auto_mode_type { + V4L2_FOCUS_AUTO_NORMAL = 0, + V4L2_FOCUS_AUTO_MACRO = 1, + V4L2_FOCUS_AUTO_CONTINUOUS = 2, + V4L2_FOCUS_AUTO_FACE_DETECTION = 3, + V4L2_FOCUS_AUTO_RECTANGLE = 4 +}; + /* FM Modulator class control IDs */ #define V4L2_CID_FM_TX_CLASS_BASE (V4L2_CTRL_CLASS_FM_TX | 0x900) #define V4L2_CID_FM_TX_CLASS (V4L2_CTRL_CLASS_FM_TX | 1)