commit 50b3cbb293d916a37d6f43ef959cce383b48335d
author Chien-Yu Chen <cychen@google.com> Thu Aug 31 22:06:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 22:06:21 2017 +0000
tree b2e2a9bf41b3915603c3dbe579b733fb7491e277
parent ed21bb723a6654910ce6004bf4bdb00db82b9b6a
parent 8129935589ac1cbcd03a6b4eda145b84c7013d3b

Merge "pbcamera: Add debug param" into oc-mr1-dev
am: 8129935589

Change-Id: I57194dccd7ac5d8f2d440cf5d8eb8f711f1833ab

camera/include/HdrPlusTypes.h

diff --git a/camera/include/HdrPlusTypes.h b/camera/include/HdrPlusTypes.h
index aa68206..54cf8c7 100644
--- a/camera/include/HdrPlusTypes.h
+++ b/camera/include/HdrPlusTypes.h
@@ -224,6 +224,11 @@
             std::array<T, SIZE> values);
 } // namespace metadatautils
 
+static const uint32_t DEBUG_PARAM_NONE                      = 0u;
+static const uint32_t DEBUG_PARAM_SAVE_GCAME_INPUT_METERING = (1u);
+static const uint32_t DEBUG_PARAM_SAVE_GCAME_INPUT_PAYLOAD  = (1u << 1);
+static const uint32_t DEBUG_PARAM_SAVE_GCAME_TEXT           = (1u << 2);
+
 /*
  * StaticMetadata defines a camera device's characteristics.
  *
@@ -253,6 +258,8 @@
     std::array<int32_t, 2> shadingMapSize; // android.lens.info.shadingMapSize
     uint8_t focusDistanceCalibration; // android.lens.info.focusDistanceCalibration
 
+    uint32_t debugParams; // Use HDRPLUS_DEBUG_PARAM_*
+
     // Check if the contents of lhs and rhs are equal. For vector and array variables, two are
     // equal if their elements are equal at the same position.
     bool operator==(const StaticMetadata& rhs) const {
@@ -274,7 +281,8 @@
                availableApertures == rhs.availableApertures &&
                availableFocalLengths == rhs.availableFocalLengths &&
                shadingMapSize == rhs.shadingMapSize &&
-               focusDistanceCalibration == rhs.focusDistanceCalibration;
+               focusDistanceCalibration == rhs.focusDistanceCalibration &&
+               debugParams == rhs.debugParams;
     }
 
     // Convert this static metadata to a string and append it to the specified string.
@@ -308,6 +316,7 @@
         metadatautils::appendVectorOrArrayToString(strOut, "shadingMapSize", shadingMapSize);
         metadatautils::appendValueToString(strOut, "focusDistanceCalibration",
                 focusDistanceCalibration);
+        metadatautils::appendValueToString(strOut, "debugParams", debugParams);
     }
 };