diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-05-06 16:47:30 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-05-10 15:14:56 +0800 |
| commit | ca099614841bc619f217dfa088da630a7eb1ab65 (patch) | |
| tree | 7c804ef7da518a1193d481e325909e0240bff1c7 | |
| parent | 7768892c82f3b037c19c608c6d8309938fd5ca21 (diff) | |
| download | frameworks_base-ca099614841bc619f217dfa088da630a7eb1ab65.zip frameworks_base-ca099614841bc619f217dfa088da630a7eb1ab65.tar.gz frameworks_base-ca099614841bc619f217dfa088da630a7eb1ab65.tar.bz2 | |
Add continuous focus mode constant.
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 10 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 6 | ||||
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 1 |
4 files changed, 28 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 4db9ee8..dcecd28 100644 --- a/api/current.xml +++ b/api/current.xml @@ -76503,6 +76503,17 @@ visibility="public" > </field> +<field name="FOCUS_MODE_CONTINUOUS" + type="java.lang.String" + transient="false" + volatile="false" + value=""continuous"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FOCUS_MODE_EDOF" type="java.lang.String" transient="false" diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 4ddcb56..6dc1a86 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -874,6 +874,16 @@ public class Camera { */ public static final String FOCUS_MODE_EDOF = "edof"; + /** + * Continuous focus mode. The camera continuously tries to focus. This + * is ideal for shooting video or shooting photo of moving object. + * Continuous focus starts when {@link #autoFocus(AutoFocusCallback)} is + * called. AutoFocusCallback will be only called once as soon as the + * picture is in focus. + */ + public static final String FOCUS_MODE_CONTINUOUS = "continuous"; + + // Formats for setPreviewFormat and setPictureFormat. private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp"; private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 3b0e9e5..0d27f1a 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -316,6 +316,12 @@ public: // continuously. Applications should not call // CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_EDOF[]; + // Continuous focus mode. The camera continuously tries to focus. This is + // ideal for shooting video or shooting photo of moving object. Continuous + // focus starts when CameraHardwareInterface.autoFocus is called. Focus + // callback will be only called once as soon as the picture is in focus. + static const char FOCUS_MODE_CONTINUOUS[]; + private: DefaultKeyedVector<String8,String8> mMap; diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index b50d4d2..d8f9c71 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/camera/CameraParameters.cpp @@ -137,6 +137,7 @@ const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; 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[] = "continuous"; CameraParameters::CameraParameters() : mMap() |