diff options
| author | James Painter <jpainter@google.com> | 2012-09-28 00:09:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-28 17:26:55 -0700 |
| commit | 0517e304d0cce25653a033e3cb00172d54ba251d (patch) | |
| tree | 4f4f1433c3a02eb25e84648c8a8d9f64eee10de0 /services | |
| parent | bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a (diff) | |
| download | frameworks_av-0517e304d0cce25653a033e3cb00172d54ba251d.zip frameworks_av-0517e304d0cce25653a033e3cb00172d54ba251d.tar.gz frameworks_av-0517e304d0cce25653a033e3cb00172d54ba251d.tar.bz2 | |
DO NOT MERGE: Remove experimental parameters for burst mode
Bug: 7248756
Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 16 | ||||
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.h | 1 |
2 files changed, 0 insertions, 17 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 6383434..8ae390d 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -1331,10 +1331,6 @@ 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; @@ -1746,18 +1742,6 @@ Parameters::Parameters::focusMode_t Parameters::focusModeStringToEnum( Parameters::FOCUS_MODE_INVALID; } -Parameters::Parameters::lightFxMode_t Parameters::lightFxStringToEnum( - const char *lightFxMode) { - return - !lightFxMode ? - Parameters::LIGHTFX_NONE : - !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; diff --git a/services/camera/libcameraservice/camera2/Parameters.h b/services/camera/libcameraservice/camera2/Parameters.h index af23a4e..f830e21 100644 --- a/services/camera/libcameraservice/camera2/Parameters.h +++ b/services/camera/libcameraservice/camera2/Parameters.h @@ -213,7 +213,6 @@ struct Parameters { static int sceneModeStringToEnum(const char *sceneMode); static flashMode_t flashModeStringToEnum(const char *flashMode); static focusMode_t focusModeStringToEnum(const char *focusMode); - static lightFxMode_t lightFxStringToEnum(const char *lightFxMode); static status_t parseAreas(const char *areasCStr, Vector<Area> *areas); static status_t validateAreas(const Vector<Area> &areas, |