diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-17 19:51:39 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-17 19:51:39 +0000 |
| commit | 8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b (patch) | |
| tree | 4260fccb0fc3fede82d6ac4761ff99192ec1753b | |
| parent | 21f546d8b0259380048b14d42b38243b5ddc9fe4 (diff) | |
| download | frameworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.zip frameworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.tar.gz frameworks_av-8001424a87f9b7e2dd2482b9ff257b9bff3a4d8b.tar.bz2 | |
camera: add cityid parameter and getInt64 stub for t0lte camera hal
Change-Id: I28a1a909aa8267ba77c2b44d4191f7a92e8ef533
| -rw-r--r-- | camera/CameraParameters.cpp | 8 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 0931c2c..f41be22 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -154,6 +154,7 @@ const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake"; const char CameraParameters::KEY_METERING[] = "metering"; const char CameraParameters::KEY_WDR[] = "wdr"; const char CameraParameters::KEY_WEATHER[] = "weather"; +const char CameraParameters::KEY_CITYID[] = "contextualtag-cityid"; #endif const char CameraParameters::TRUE[] = "true"; @@ -485,6 +486,13 @@ int CameraParameters::getInt(const char *key) const return strtol(v, 0, 0); } +#ifdef SAMSUNG_CAMERA_HARDWARE +int CameraParameters::getInt64(const char *key) const +{ + return -1; +} +#endif + float CameraParameters::getFloat(const char *key) const { const char *v = get(key); diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index e82d8e7..21e907e 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -66,6 +66,9 @@ public: void setFloat(const char *key, float value); const char *get(const char *key) const; int getInt(const char *key) const; +#ifdef SAMSUNG_CAMERA_HARDWARE + int getInt64(const char *key) const; +#endif float getFloat(const char *key) const; void remove(const char *key); @@ -631,6 +634,7 @@ public: static const char KEY_METERING[]; static const char KEY_WDR[]; static const char KEY_WEATHER[]; + static const char KEY_CITYID[]; #endif static const char KEY_AE_BRACKET_HDR[]; |