Hi Sylwester,
Thanks for the patch,
Sylwester Nawrocki wrote:
> Add following auto focus controls:
>
> - V4L2_CID_AUTO_FOCUS_START - single-shot auto focus start
> - V4L2_CID_AUTO_FOCUS_STOP - single-shot auto focus stop
> - V4L2_CID_AUTO_FOCUS_STATUS - automatic focus status
> - V4L2_CID_AUTO_FOCUS_AREA - automatic focus area selection
> - V4L2_CID_AUTO_FOCUS_DISTANCE - automatic focus scan range selection
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> Documentation/DocBook/media/v4l/controls.xml | 147 +++++++++++++++++++++++++-
> drivers/media/video/v4l2-ctrls.c | 31 +++++-
> include/linux/videodev2.h | 25 +++++
> 3 files changed, 200 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
> index 4a463d3..d8ef71e 100644
> --- a/Documentation/DocBook/media/v4l/controls.xml
> +++ b/Documentation/DocBook/media/v4l/controls.xml
> @@ -2902,13 +2902,156 @@ negative values towards infinity. This is a write-only control.</entry>
> <row>
> <entry spanname="id"><constant>V4L2_CID_FOCUS_AUTO</constant> </entry>
> <entry>boolean</entry>
> - </row><row><entry spanname="descr">Enables automatic focus
> -adjustments. The effect of manual focus adjustments while this feature
> + </row><row><entry spanname="descr">Enables continuous automatic
> +focus adjustments. The effect of manual focus adjustments while this feature
> is enabled is undefined, drivers should ignore such requests.</entry>
> </row>
> <row><entry></entry></row>
>
> <row>
> + <entry spanname="id"><constant>V4L2_CID_AUTO_FOCUS_START</constant> </entry>
> + <entry>button</entry>
> + </row><row><entry spanname="descr">Starts single auto focus process.
> +The effect of setting this control when <constant>V4L2_CID_FOCUS_AUTO</constant>
> +is set to <constant>TRUE</constant> (1) is undefined, drivers should ignore
> +such requests.</entry>
> + </row>
> + <row><entry></entry></row>
> +
> + <row>
> + <entry spanname="id"><constant>V4L2_CID_AUTO_FOCUS_STOP</constant> </entry>
> + <entry>button</entry>
> + </row><row><entry spanname="descr">Aborts automatic focusing
> +started with <constant>V4L2_CID_AUTO_FOCUS_START</constant> control. It is
> +effective only when the continuous autofocus is disabled, that is when
> +<constant>V4L2_CID_FOCUS_AUTO</constant> control is set to <constant>FALSE
> +</constant> (0).</entry>
> + </row>
> + <row><entry></entry></row>
> +
> + <row id="v4l2-auto-focus-status">
> + <entry spanname="id">
> + <constant>V4L2_CID_AUTO_FOCUS_STATUS</constant> </entry>
> + <entry>bitmask</entry>
> + </row>
> + <row><entry spanname="descr">The automatic focus status. This is a read-only
> + control.</entry>
> + </row>
> + <row>
> + <entrytbl spanname="descr" cols="2">
> + <tbody valign="top">
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_STATUS_IDLE</constant> </entry>
> + <entry>Automatic focus is not active.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_STATUS_BUSY</constant> </entry>
> + <entry>Automatic focusing is in progress.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_STATUS_REACHED</constant> </entry>
> + <entry>Focus has been reached.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_STATUS_LOST</constant> </entry>
> + <entry>Focus has been lost.</entry>
When does this happen?
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_STATUS_FAILED</constant> </entry>
> + <entry>Automatic focus has failed, the driver will not
> + transition from this state until another action is
> + performed by an application.</entry>
Which of these are valid for regular autofocus and which ones for
continuous autofocus? I'm a little bit confused with the above descriptions.
I might as well say that temporary conditions such as failed and reached
would return to idle after being read from user space. This is how the
flash faults behave, too.
How does this interact with the 3A lock control?
> + </row>
> + </tbody>
> + </entrytbl>
> + </row>
> + <row><entry></entry></row>
> +
> + <row id="v4l2-auto-focus-range">
> + <entry spanname="id">
> + <constant>V4L2_CID_AUTO_FOCUS_RANGE</constant> </entry>
> + <entry>enum v4l2_auto_focus_range</entry>
> + </row>
> + <row><entry spanname="descr">Determines auto focus distance range
> +for which lens may be adjusted. </entry>
> + </row>
> + <row>
> + <entrytbl spanname="descr" cols="2">
> + <tbody valign="top">
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_RANGE_AUTO</constant> </entry>
> + <entry>The camera automatically selects the focus range.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_RANGE_NORMAL</constant> </entry>
> + <entry>The auto focus normal distance range. It is limited
> +for best auto focus algorithm performance.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_RANGE_MACRO</constant> </entry>
> + <entry>Macro (close-up) auto focus. The camera will
> +use minimum possible distance that it is capable of for auto focus.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_RANGE_INFINITY</constant> </entry>
> + <entry>The focus at an object at infinite distance.</entry>
> + </row>
> + </tbody>
> + </entrytbl>
> + </row>
> + <row><entry></entry></row>
> +
> + <row id="v4l2-auto-focus-area">
> + <entry spanname="id">
> + <constant>V4L2_CID_AUTO_FOCUS_AREA</constant> </entry>
> + <entry>enum v4l2_auto_focus_area</entry>
> + </row>
> + <row><entry spanname="descr">Determines the area of the frame that
> +the camera uses for automatic focus. The corresponding coordinates of the
> +focusing spot or rectangle can be specified and queried using the selection API.
> +To change the auto focus region of interest applications first select required
> +mode of this control and then set the rectangle or spot coordinates by means
> +of the &VIDIOC-SUBDEV-S-SELECTION; or &VIDIOC-S-SELECTION; ioctl. In order to
> +trigger again an auto focus process with same coordinates applications should
> +use the <constant>V4L2_CID_AUTO_FOCUS_START </constant> control. Or alternatively
> +invoke a &VIDIOC-SUBDEV-S-SELECTION; or a &VIDIOC-S-SELECTION; ioctl again.
> +In the latter case the new pixel coordinates are applied to hardware only when
> +the focus area control is set to a value other than
> +<constant>V4L2_AUTO_FOCUS_AREA_ALL</constant>.</entry>
> + </row>
> + <row>
> + <entrytbl spanname="descr" cols="2">
> + <tbody valign="top">
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_AREA_ALL</constant> </entry>
> + <entry>Normal auto focus, the focusing area extends over the
> +entire frame.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_AREA_SPOT</constant> </entry>
> + <entry>Automatic focus on a spot within the frame at position
> +specified by the <constant>V4L2_SEL_TGT_AUTO_FOCUS_ACTUAL</constant> or
> +<constant>V4L2_SUBDEV_SEL_TGT_AUTO_FOCUS_ACTUAL</constant> selection. When these
> +selections are not supported by driver the default spot's position is center of
> +the frame.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_AREA_RECTANGLE</constant> </entry>
> + <entry>The auto focus area is determined by the <constant>
> +V4L2_SEL_TGT_AUTO_FOCUS_ACTUAL</constant> or <constant>
> +V4L2_SUBDEV_SEL_TGT_AUTO_FOCUS_ACTUAL</constant> selection rectangle.</entry>
> + </row>
> + <row>
> + <entry><constant>V4L2_AUTO_FOCUS_AREA_FACE_DETECTION</constant> </entry>
> + <entry>The camera automatically focuses on a detected face
> +area.</entry>
I assume there could be one or more faces to focus to, right?
> + </row>
> + </tbody>
> + </entrytbl>
> + </row>
> + <row><entry></entry></row>
> +
> + <row>
> <entry spanname="id"><constant>V4L2_CID_ZOOM_ABSOLUTE</constant> </entry>
> <entry>integer</entry>
> </row><row><entry spanname="descr">Specify the objective lens
> diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
> index 6346978..ea86a10 100644
> --- a/drivers/media/video/v4l2-ctrls.c
> +++ b/drivers/media/video/v4l2-ctrls.c
> @@ -236,6 +236,20 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
> "Spot",
> NULL
> };
> + static const char * const camera_auto_focus_area[] = {
> + "All",
> + "Spot",
> + "Rectangle",
> + "Face Detection",
> + NULL
> + };
> + static const char * const camera_auto_focus_range[] = {
> + "Auto",
> + "Normal",
> + "Macro",
> + "Infinity",
> + NULL
> + };
> static const char * const colorfx[] = {
> "None",
> "Black & White",
> @@ -453,6 +467,10 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
> return camera_exposure_auto;
> case V4L2_CID_EXPOSURE_METERING:
> return camera_exposure_metering;
> + case V4L2_CID_AUTO_FOCUS_AREA:
> + return camera_auto_focus_area;
> + case V4L2_CID_AUTO_FOCUS_RANGE:
> + return camera_auto_focus_range;
> case V4L2_CID_COLORFX:
> return colorfx;
> case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE:
> @@ -639,7 +657,7 @@ const char *v4l2_ctrl_get_name(u32 id)
> case V4L2_CID_TILT_ABSOLUTE: return "Tilt, Absolute";
> case V4L2_CID_FOCUS_ABSOLUTE: return "Focus, Absolute";
> case V4L2_CID_FOCUS_RELATIVE: return "Focus, Relative";
> - case V4L2_CID_FOCUS_AUTO: return "Focus, Automatic";
> + case V4L2_CID_FOCUS_AUTO: return "Focus, Automatic Continuous";
> case V4L2_CID_ZOOM_ABSOLUTE: return "Zoom, Absolute";
> case V4L2_CID_ZOOM_RELATIVE: return "Zoom, Relative";
> case V4L2_CID_ZOOM_CONTINUOUS: return "Zoom, Continuous";
> @@ -655,6 +673,11 @@ const char *v4l2_ctrl_get_name(u32 id)
> case V4L2_CID_EXPOSURE_METERING: return "Exposure, Metering Mode";
> case V4L2_CID_SCENE_MODE: return "Scene Mode";
> case V4L2_CID_3A_LOCK: return "3A Lock";
> + case V4L2_CID_AUTO_FOCUS_START: return "Auto Focus, Start";
> + case V4L2_CID_AUTO_FOCUS_STOP: return "Auto Focus, Stop";
> + case V4L2_CID_AUTO_FOCUS_STATUS: return "Auto Focus, Status";
> + case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range";
> + case V4L2_CID_AUTO_FOCUS_AREA: return "Auto Focus, Area";
>
> /* FM Radio Modulator control */
> /* Keep the order of the 'case's the same as in videodev2.h! */
> @@ -756,6 +779,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
> case V4L2_CID_TILT_RESET:
> case V4L2_CID_FLASH_STROBE:
> case V4L2_CID_FLASH_STROBE_STOP:
> + case V4L2_CID_AUTO_FOCUS_START:
> + case V4L2_CID_AUTO_FOCUS_STOP:
> *type = V4L2_CTRL_TYPE_BUTTON;
> *flags |= V4L2_CTRL_FLAG_WRITE_ONLY;
> *min = *max = *step = *def = 0;
> @@ -779,6 +804,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
> case V4L2_CID_MPEG_STREAM_TYPE:
> case V4L2_CID_MPEG_STREAM_VBI_FMT:
> case V4L2_CID_EXPOSURE_AUTO:
> + case V4L2_CID_AUTO_FOCUS_AREA:
> + case V4L2_CID_AUTO_FOCUS_RANGE:
> case V4L2_CID_COLORFX:
> case V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE:
> case V4L2_CID_TUNE_PREEMPHASIS:
> @@ -828,6 +855,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
> case V4L2_CID_FLASH_FAULT:
> case V4L2_CID_JPEG_ACTIVE_MARKER:
> case V4L2_CID_3A_LOCK:
> + case V4L2_CID_AUTO_FOCUS_STATUS:
> *type = V4L2_CTRL_TYPE_BITMASK;
> break;
> case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE:
> @@ -887,6 +915,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
> *flags |= V4L2_CTRL_FLAG_WRITE_ONLY;
> break;
> case V4L2_CID_FLASH_STROBE_STATUS:
> + case V4L2_CID_AUTO_FOCUS_STATUS:
> case V4L2_CID_FLASH_READY:
> *flags |= V4L2_CTRL_FLAG_READ_ONLY;
> break;
> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
> index 6bfd6c5..1d5b839 100644
> --- a/include/linux/videodev2.h
> +++ b/include/linux/videodev2.h
> @@ -1754,6 +1754,31 @@ enum v4l2_scene_mode {
> #define V4L2_LOCK_WHITE_BALANCE (1 << 1)
> #define V4L2_LOCK_FOCUS (1 << 2)
>
> +#define V4L2_CID_AUTO_FOCUS_START (V4L2_CID_CAMERA_CLASS_BASE+28)
> +#define V4L2_CID_AUTO_FOCUS_STOP (V4L2_CID_CAMERA_CLASS_BASE+29)
> +#define V4L2_CID_AUTO_FOCUS_STATUS (V4L2_CID_CAMERA_CLASS_BASE+30)
> +#define V4L2_AUTO_FOCUS_STATUS_IDLE (0 << 0)
> +#define V4L2_AUTO_FOCUS_STATUS_BUSY (1 << 0)
> +#define V4L2_AUTO_FOCUS_STATUS_REACHED (1 << 1)
> +#define V4L2_AUTO_FOCUS_STATUS_LOST (1 << 2)
> +#define V4L2_AUTO_FOCUS_STATUS_FAILED (1 << 3)
> +
> +#define V4L2_CID_AUTO_FOCUS_RANGE (V4L2_CID_CAMERA_CLASS_BASE+31)
> +enum v4l2_auto_focus_range {
> + V4L2_AUTO_FOCUS_RANGE_AUTO = 0,
> + V4L2_AUTO_FOCUS_RANGE_NORMAL = 1,
> + V4L2_AUTO_FOCUS_RANGE_MACRO = 2,
> + V4L2_AUTO_FOCUS_RANGE_INFINITY = 3,
> +};
> +
> +#define V4L2_CID_AUTO_FOCUS_AREA (V4L2_CID_CAMERA_CLASS_BASE+32)
> +enum v4l2_auto_focus_area {
> + V4L2_AUTO_FOCUS_AREA_ALL = 0,
> + V4L2_AUTO_FOCUS_AREA_SPOT = 1,
> + V4L2_AUTO_FOCUS_AREA_RECTANGLE = 2,
> + V4L2_AUTO_FOCUS_AREA_FACE_DETECTION = 3,
> +};
> +
> /* 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)
Cheers,
--
Sakari Ailus
sakari.ailus@xxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
