diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2012-06-07 10:32:12 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2012-06-07 12:04:12 -0700 |
commit | 6861a4e9f929c2cb4a3131244e01e676c5b28f55 (patch) | |
tree | b0d4919e162c3504869a5d7aaa7196198fd5931f /services/camera/libcameraservice/Camera2Client.h | |
parent | ac45eb3dfa7347f7b8c98be1111b2a5f9e344c46 (diff) | |
download | frameworks_av-6861a4e9f929c2cb4a3131244e01e676c5b28f55.zip frameworks_av-6861a4e9f929c2cb4a3131244e01e676c5b28f55.tar.gz frameworks_av-6861a4e9f929c2cb4a3131244e01e676c5b28f55.tar.bz2 |
Camera2: Add setParameters call
- Validate new parameters and transfer to internal parameters
- Add several utility functions to convert between CameraParameter
strings and camera2/internal parameter enums
Bug: 6243944
Change-Id: I323798dbfa028066f4963a6357766a781dde7cb6
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.h')
-rw-r--r-- | services/camera/libcameraservice/Camera2Client.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h index 2bdf7d4..e2a0086 100644 --- a/services/camera/libcameraservice/Camera2Client.h +++ b/services/camera/libcameraservice/Camera2Client.h @@ -193,7 +193,22 @@ private: // Update preview request based on mParams status_t updatePreviewRequest(); + + // Convert camera1 preview format string to camera2 enum + static int formatStringToEnum(const char *format); static const char *formatEnumToString(int format); + + static int wbModeStringToEnum(const char *wbMode); + static int effectModeStringToEnum(const char *effectMode); + static int abModeStringToEnum(const char *abMode); + static int sceneModeStringToEnum(const char *sceneMode); + static Parameters::flashMode_t flashModeStringToEnum(const char *flashMode); + static Parameters::focusMode_t focusModeStringToEnum(const char *focusMode); + static status_t parseAreas(const char *areasCStr, + Vector<Parameters::Area> *areas); + static status_t validateAreas(const Vector<Parameters::Area> &areas, + size_t maxRegions); + static bool boolFromString(const char *boolStr); }; }; // namespace android |