diff options
| author | Peng Zhu <c_pzhu@codeaurora.org> | 2013-11-20 16:11:24 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-19 00:23:24 -0700 |
| commit | 4a0d8447e0aaebff6dbfb25bb61b811f5fd9e68f (patch) | |
| tree | 8c45a57ad1d512cbad7ea67255723d4bd6796400 | |
| parent | e67b624a7f64d702fde241624724785eafa67645 (diff) | |
| download | frameworks_av-4a0d8447e0aaebff6dbfb25bb61b811f5fd9e68f.zip frameworks_av-4a0d8447e0aaebff6dbfb25bb61b811f5fd9e68f.tar.gz frameworks_av-4a0d8447e0aaebff6dbfb25bb61b811f5fd9e68f.tar.bz2 | |
Camera: Add support for manual 3A.
Add manual white balance mode.
user can set the specific cct to lock the white balance.Just as other
white balance mode, it will lock the white balance once it's set, the
only difference it that the cct value is set from app.
Add manual focus mode
allow app to set the focus distance with DAC value or actuator
step value. Once the value is set, the focus distance is locked
unless app switch it back to automatically mode
Change-Id: I0c08ad0cea27284645e9e710c26844ca24a5c477
| -rw-r--r-- | camera/CameraParameters.cpp | 2 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 11f2fd1..d35519d 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -107,6 +107,7 @@ const char CameraParameters::WHITE_BALANCE_DAYLIGHT[] = "daylight"; const char CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT[] = "cloudy-daylight"; const char CameraParameters::WHITE_BALANCE_TWILIGHT[] = "twilight"; const char CameraParameters::WHITE_BALANCE_SHADE[] = "shade"; +const char CameraParameters::WHITE_BALANCE_MANUAL_CCT[] = "manual-cct"; // Values for effect settings. const char CameraParameters::EFFECT_NONE[] = "none"; @@ -169,6 +170,7 @@ 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"; +const char CameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual"; // Values for light fx settings const char CameraParameters::LIGHTFX_LOWLIGHT[] = "low-light"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 74517b4..d85050d 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -555,6 +555,7 @@ public: static const char WHITE_BALANCE_CLOUDY_DAYLIGHT[]; static const char WHITE_BALANCE_TWILIGHT[]; static const char WHITE_BALANCE_SHADE[]; + static const char WHITE_BALANCE_MANUAL_CCT[]; // Values for effect settings. static const char EFFECT_NONE[]; @@ -678,6 +679,8 @@ public: // other modes. static const char FOCUS_MODE_CONTINUOUS_PICTURE[]; + static const char FOCUS_MODE_MANUAL_POSITION[]; + // Values for light special effects // Low-light enhancement mode static const char LIGHTFX_LOWLIGHT[]; |