Camera2: Minor parameter restructuring
Will make it easier to update HAL-level parameters.
Bug: 6243944
Change-Id: I3acac3c532de440d46755ce3e1d819ad5ed2e106
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h
index 791c5e1..18898b9 100644
--- a/services/camera/libcameraservice/Camera2Client.h
+++ b/services/camera/libcameraservice/Camera2Client.h
@@ -105,20 +105,20 @@
// here if they don't cleanly map to camera2 values.
struct Parameters {
int previewWidth, previewHeight;
- int previewFpsRangeMin, previewFpsRangeMax;
+ int32_t previewFpsRange[2];
int previewFps; // deprecated, here only for tracking changes
int previewFormat;
+ int previewTransform; // set by CAMERA_CMD_SET_DISPLAY_ORIENTATION
+
int pictureWidth, pictureHeight;
- int jpegThumbWidth, jpegThumbHeight;
- int jpegQuality, jpegThumbQuality;
- int jpegRotation;
+ int32_t jpegThumbSize[2];
+ int32_t jpegQuality, jpegThumbQuality;
+ int32_t jpegRotation;
bool gpsEnabled;
- double gpsLatitude;
- double gpsLongitude;
- double gpsAltitude;
+ double gpsCoordinates[3];
int64_t gpsTimestamp;
String8 gpsProcessingMethod;
@@ -158,7 +158,7 @@
};
Vector<Area> focusingAreas;
- int exposureCompensation;
+ int32_t exposureCompensation;
bool autoExposureLock;
bool autoWhiteBalanceLock;