From: "Kim, HeungJun" <riverful.kim@samsung.com>
To: "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
"???/Mobile S/W Platform Lab(DMC?)/E4(??)/????"
<sw0312.kim@samsung.com>,
"kyungmin.park@samsung.com" <kyungmin.park@samsung.com>
Subject: [RFC PATCH RESEND v2 3/3] v4l2-ctrls: document the changes about auto focus mode
Date: Thu, 03 Mar 2011 11:16:34 +0900 [thread overview]
Message-ID: <4D6EFA02.4080105@samsung.com> (raw)
Document about the type changes and the enumeration of the auto focus control.
Signed-off-by: Heungjun Kim <riverful.kim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
Documentation/DocBook/v4l/controls.xml | 31 +++++++++++++++++++++++++---
Documentation/DocBook/v4l/videodev2.h.xml | 6 +++++
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml
index 2fae3e8..889fa84 100644
--- a/Documentation/DocBook/v4l/controls.xml
+++ b/Documentation/DocBook/v4l/controls.xml
@@ -1801,12 +1801,35 @@ negative values towards infinity. This is a write-only control.</entry>
</row>
<row><entry></entry></row>
- <row>
+ <row id="v4l2-focus-auto-type">
<entry spanname="id"><constant>V4L2_CID_FOCUS_AUTO</constant> </entry>
- <entry>boolean</entry>
+ <entry>enum v4l2_focus_auto_type</entry>
</row><row><entry spanname="descr">Enables automatic focus
-adjustments. The effect of manual focus adjustments while this feature
-is enabled is undefined, drivers should ignore such requests.</entry>
+adjustments of the normal or macro or continuous(CAF) mode. The effect of
+manual focus adjustments while this feature is enabled is undefined,
+drivers should ignore such requests. Possible values are:</entry>
+ </row>
+ <row>
+ <entrytbl spanname="descr" cols="2">
+ <tbody valign="top">
+ <row>
+ <entry><constant>V4L2_FOCUS_MANUAL</constant> </entry>
+ <entry>Manual focus mode.</entry>
+ </row>
+ <row>
+ <entry><constant>V4L2_FOCUS_AUTO</constant> </entry>
+ <entry>Auto focus mode with normal operation.</entry>
+ </row>
+ <row>
+ <entry><constant>V4L2_FOCUS_MACRO</constant> </entry>
+ <entry>Auto focus mode with macro operation.</entry>
+ </row>
+ <row>
+ <entry><constant>V4L2_FOCUS_CONTINUOUS</constant> </entry>
+ <entry>Auto focus mode with continuous(CAF) operation.</entry>
+ </row>
+ </tbody>
+ </entrytbl>
</row>
<row><entry></entry></row>
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml
index 325b23b..ccf6c2b 100644
--- a/Documentation/DocBook/v4l/videodev2.h.xml
+++ b/Documentation/DocBook/v4l/videodev2.h.xml
@@ -1291,6 +1291,12 @@ enum <link linkend="v4l2-exposure-auto-type">v4l2_exposure_auto_type</link> {
#define V4L2_CID_FOCUS_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+10)
#define V4L2_CID_FOCUS_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+11)
#define V4L2_CID_FOCUS_AUTO (V4L2_CID_CAMERA_CLASS_BASE+12)
+enum <link linkend="v4l2-focus-auto-type">v4l2_exposure_auto_type</link> {
+ V4L2_FOCUS_MANUAL = 0,
+ V4L2_FOCUS_AUTO = 1,
+ V4L2_FOCUS_MACRO = 2,
+ V4L2_FOCUS_CONTINUOUS = 3
+};
#define V4L2_CID_ZOOM_ABSOLUTE (V4L2_CID_CAMERA_CLASS_BASE+13)
#define V4L2_CID_ZOOM_RELATIVE (V4L2_CID_CAMERA_CLASS_BASE+14)
--
1.7.0.4
next reply other threads:[~2011-03-03 2:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-03 2:16 Kim, HeungJun [this message]
2011-03-03 10:08 ` [RFC PATCH RESEND v2 3/3] v4l2-ctrls: document the changes about auto focus mode Laurent Pinchart
2011-03-03 13:17 ` Kim HeungJun
2011-03-03 13:24 ` Laurent Pinchart
2011-03-03 14:34 ` Kim HeungJun
2011-03-03 15:22 ` Laurent Pinchart
2011-03-03 15:53 ` Kim HeungJun
2011-03-08 23:08 ` Sylwester Nawrocki
2011-03-09 5:23 ` Kim, HeungJun
-- strict thread matches above, loose matches on Subject: below --
2011-02-25 12:46 Kim, HeungJun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D6EFA02.4080105@samsung.com \
--to=riverful.kim@samsung.com \
--cc=hverkuil@xs4all.nl \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=sw0312.kim@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox