Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."

Browse Source
This commit is contained in:
Wu-cheng Li
2011-08-17 22:24:53 -07:00
committed by Android (Google) Code Review
parent 7fa6e42483 b9ac75d3df
commit fde00591c6
3 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/hardware/Camera.java
View File

@@ -1613,17 +1613,34 @@ public class Camera {
/**
* Continuous auto focus mode intended for video recording. The camera
* continuously tries to focus. This is ideal for shooting video.
* Applications still can call {@link
* #takePicture(Camera.ShutterCallback, Camera.PictureCallback,
* Camera.PictureCallback)} in this mode but the subject may not be in
* focus. Auto focus starts when the parameter is set. Applications
* should not call {@link #autoFocus(AutoFocusCallback)} in this mode.
* To stop continuous focus, applications should change the focus mode
* to other modes.
* continuously tries to focus. This is the best choice for video
* recording because the focus changes smoothly . Applications still can
* call {@link #takePicture(Camera.ShutterCallback,
* Camera.PictureCallback, Camera.PictureCallback)} in this mode but the
* subject may not be in focus. Auto focus starts when the parameter is
* set. Applications should not call {@link
* #autoFocus(AutoFocusCallback)} in this mode. To stop continuous
* focus, applications should change the focus mode to other modes.
*/
public static final String FOCUS_MODE_CONTINUOUS_VIDEO = "continuous-video";
/**
* Continuous auto focus mode intended for taking pictures. The camera
* continuously tries to focus. The speed of focus change is more
* aggressive than {@link #FOCUS_MODE_CONTINUOUS_VIDEO}. Auto focus
* starts when the parameter is set. If applications call {@link
* #autoFocus(AutoFocusCallback)} in this mode, the focus callback will
* immediately return with a boolean that indicates whether the focus is
* sharp or not. The apps can then decide if they want to take a picture
* immediately or to change the focus mode to auto, and run a full
* autofocus cycle. To stop continuous focus, applications should change
* the focus mode to other modes.
*
* @see #FOCUS_MODE_CONTINUOUS_VIDEO
* @hide
*/
public static final String FOCUS_MODE_CONTINUOUS_PICTURE = "continuous-picture";
// Indices for focus distance array.
/**
* The array index of near focus distance for use with

23
include/camera/CameraParameters.h
View File

@@ -597,13 +597,24 @@ public:
// CameraHardwareInterface.autoFocus in this mode.
static const char FOCUS_MODE_EDOF[];
// Continuous auto focus mode intended for video recording. The camera
// continuously tries to focus. This is ideal for shooting video.
// Applications still can call CameraHardwareInterface.takePicture in this
// mode but the subject may not be in focus. Auto focus starts when the
// parameter is set. Applications should not call
// CameraHardwareInterface.autoFocus in this mode. To stop continuous focus,
// applications should change the focus mode to other modes.
// continuously tries to focus. This is the best choice for video
// recording because the focus changes smoothly . Applications still can
// call CameraHardwareInterface.takePicture in this mode but the subject may
// not be in focus. Auto focus starts when the parameter is set.
// Applications should not call CameraHardwareInterface.autoFocus in this
// mode. To stop continuous focus, applications should change the focus mode
// to other modes.
static const char FOCUS_MODE_CONTINUOUS_VIDEO[];
// Continuous auto focus mode intended for taking pictures. The camera
// continuously tries to focus. The speed of focus change is more aggressive
// than FOCUS_MODE_CONTINUOUS_VIDEO. Auto focus starts when the parameter is
// set. If applications call autoFocus in this mode, the focus callback will
// immediately return with a boolean that indicates the focus is sharp or
// not. The apps can then decide if they want to take a picture immediately
// or to change the focus mode to auto, and run a full autofocus cycle. To
// stop continuous focus, applications should change the focus mode to other
// modes.
static const char FOCUS_MODE_CONTINUOUS_PICTURE[];
private:
DefaultKeyedVector<String8,String8> mMap;

1
libs/camera/CameraParameters.cpp
View File

@@ -160,6 +160,7 @@ const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";
const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";
const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";
const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";
const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-picture";
CameraParameters::CameraParameters()
: mMap()