diff options
| author | Igor Murashkin <iam@google.com> | 2014-03-25 20:15:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 20:15:40 +0000 |
| commit | c3dcf1007aa964f825b2ea2ef86acb7f332e748f (patch) | |
| tree | c3e72b5ad4c3a145413a2a6e964719dbf908059e /services/camera/libcameraservice/api1/client2/Parameters.h | |
| parent | a1aaaf86cd04eabaf961a30d7b0a9fa857089862 (diff) | |
| parent | 65550a0e17852fe657795508e3bf05bdbfb2520b (diff) | |
| download | frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.zip frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.tar.gz frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.tar.bz2 | |
am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '65550a0e17852fe657795508e3bf05bdbfb2520b':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Diffstat (limited to 'services/camera/libcameraservice/api1/client2/Parameters.h')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.h b/services/camera/libcameraservice/api1/client2/Parameters.h index 32dbd42..da07ccf 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.h +++ b/services/camera/libcameraservice/api1/client2/Parameters.h @@ -25,6 +25,7 @@ #include <utils/Vector.h> #include <utils/KeyedVector.h> #include <camera/CameraParameters.h> +#include <camera/CameraParameters2.h> #include <camera/CameraMetadata.h> namespace android { @@ -32,7 +33,7 @@ namespace camera2 { /** * Current camera state; this is the full state of the Camera under the old - * camera API (contents of the CameraParameters object in a more-efficient + * camera API (contents of the CameraParameters2 object in a more-efficient * format, plus other state). The enum values are mostly based off the * corresponding camera2 enums, not the camera1 strings. A few are defined here * if they don't cleanly map to camera2 values. @@ -128,7 +129,7 @@ struct Parameters { LIGHTFX_HDR } lightFx; - CameraParameters params; + CameraParameters2 params; String8 paramsFlattened; // These parameters are also part of the camera API-visible state, but not |