Camera: Switch dynamic range profiles to 64bit values
Bug: 215396395
Test: Camera CTS
Change-Id: Ic689488a4cbcd1baa9d288cd444a1d9ce82fda82
diff --git a/camera/camera2/OutputConfiguration.cpp b/camera/camera2/OutputConfiguration.cpp
index 4300f9a..5b8da34 100644
--- a/camera/camera2/OutputConfiguration.cpp
+++ b/camera/camera2/OutputConfiguration.cpp
@@ -77,7 +77,7 @@
return mSensorPixelModesUsed;
}
-int OutputConfiguration::getDynamicRangeProfile() const {
+int64_t OutputConfiguration::getDynamicRangeProfile() const {
return mDynamicRangeProfile;
}
@@ -186,8 +186,8 @@
ALOGE("%s: Failed to read sensor pixel mode(s) from parcel", __FUNCTION__);
return err;
}
- int dynamicProfile;
- if ((err = parcel->readInt32(&dynamicProfile)) != OK) {
+ int64_t dynamicProfile;
+ if ((err = parcel->readInt64(&dynamicProfile)) != OK) {
ALOGE("%s: Failed to read surface dynamic range profile flag from parcel", __FUNCTION__);
return err;
}
@@ -314,7 +314,7 @@
err = parcel->writeParcelableVector(mSensorPixelModesUsed);
if (err != OK) return err;
- err = parcel->writeInt32(mDynamicRangeProfile ? 1 : 0);
+ err = parcel->writeInt64(mDynamicRangeProfile);
if (err != OK) return err;
err = parcel->writeInt32(mStreamUseCase);
diff --git a/camera/include/camera/CameraSessionStats.h b/camera/include/camera/CameraSessionStats.h
index ab2d903..26dc70c 100644
--- a/camera/include/camera/CameraSessionStats.h
+++ b/camera/include/camera/CameraSessionStats.h
@@ -63,7 +63,7 @@
std::vector<int64_t> mHistogramCounts;
// Dynamic range profile
- int mDynamicRangeProfile;
+ int64_t mDynamicRangeProfile;
// Stream use case
int mStreamUseCase;
diff --git a/camera/include/camera/camera2/OutputConfiguration.h b/camera/include/camera/camera2/OutputConfiguration.h
index d7abfba..6b0f333 100644
--- a/camera/include/camera/camera2/OutputConfiguration.h
+++ b/camera/include/camera/camera2/OutputConfiguration.h
@@ -58,7 +58,7 @@
int getSurfaceType() const;
int getWidth() const;
int getHeight() const;
- int getDynamicRangeProfile() const;
+ int64_t getDynamicRangeProfile() const;
bool isDeferred() const;
bool isShared() const;
String16 getPhysicalCameraId() const;
@@ -184,7 +184,7 @@
String16 mPhysicalCameraId;
bool mIsMultiResolution;
std::vector<int32_t> mSensorPixelModesUsed;
- int mDynamicRangeProfile;
+ int64_t mDynamicRangeProfile;
int mStreamUseCase;
int mTimestampBase;
int mMirrorMode;
diff --git a/camera/ndk/include/camera/NdkCameraMetadataTags.h b/camera/ndk/include/camera/NdkCameraMetadataTags.h
index 4911429..4c492f0 100644
--- a/camera/ndk/include/camera/NdkCameraMetadataTags.h
+++ b/camera/ndk/include/camera/NdkCameraMetadataTags.h
@@ -3474,7 +3474,7 @@
* <p>A map of all available 10-bit dynamic range profiles along with their
* capture request constraints.</p>
*
- * <p>Type: int32[n*2] (acamera_metadata_enum_android_request_available_dynamic_range_profiles_map_t)</p>
+ * <p>Type: int64[n*3] (acamera_metadata_enum_android_request_available_dynamic_range_profiles_map_t)</p>
*
* <p>This tag may appear in:
* <ul>
@@ -3487,7 +3487,7 @@
* support every possible profile combination within a single capture request, then the
* constraints must be listed here as well.</p>
*/
- ACAMERA_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP = // int32[n*2] (acamera_metadata_enum_android_request_available_dynamic_range_profiles_map_t)
+ ACAMERA_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP = // int64[n*3] (acamera_metadata_enum_android_request_available_dynamic_range_profiles_map_t)
ACAMERA_REQUEST_START + 19,
ACAMERA_REQUEST_END,