diff options
| author | James Painter <jpainter@google.com> | 2012-09-05 18:02:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 16:28:00 -0700 |
| commit | e538206d15282afbc5b168d60b1026a5dfcd13c0 (patch) | |
| tree | 5126c4ce62340021498d68c43e0de7ddb11303e1 /services/camera/libcameraservice/camera2/Parameters.cpp | |
| parent | 7ac783252ef682abddd083104ab06619d82ac52f (diff) | |
| download | frameworks_av-e538206d15282afbc5b168d60b1026a5dfcd13c0.zip frameworks_av-e538206d15282afbc5b168d60b1026a5dfcd13c0.tar.gz frameworks_av-e538206d15282afbc5b168d60b1026a5dfcd13c0.tar.bz2 | |
Camera2: Add a burst mode skeleton.
Bug: 6243944
Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
Diffstat (limited to 'services/camera/libcameraservice/camera2/Parameters.cpp')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index f89d1e3..e5942dc 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -748,6 +748,10 @@ status_t Parameters::initialize(const CameraMetadata *info) { previewCallbackFlags = 0; + zslMode = false; + + lightFx = LIGHTFX_NONE; + state = STOPPED; paramsFlattened = params.flatten(); @@ -1315,6 +1319,10 @@ status_t Parameters::set(const String8& params) { ALOGE("%s: Video stabilization not supported", __FUNCTION__); } + // LIGHTFX + validatedParams.lightFx = lightFxStringToEnum( + newParams.get(CameraParameters::KEY_LIGHTFX)); + /** Update internal parameters */ validatedParams.paramsFlattened = params; @@ -1726,6 +1734,16 @@ Parameters::Parameters::focusMode_t Parameters::focusModeStringToEnum( Parameters::FOCUS_MODE_INVALID; } +Parameters::Parameters::lightFxMode_t Parameters::lightFxStringToEnum( + const char *lightFxMode) { + return + !strcmp(lightFxMode, CameraParameters::LIGHTFX_LOWLIGHT) ? + Parameters::LIGHTFX_LOWLIGHT : + !strcmp(lightFxMode, CameraParameters::LIGHTFX_HDR) ? + Parameters::LIGHTFX_HDR : + Parameters::LIGHTFX_NONE; +} + status_t Parameters::parseAreas(const char *areasCStr, Vector<Parameters::Area> *areas) { static const size_t NUM_FIELDS = 5; |