@@ -13,6 +13,7 @@
#include <array>
#include <cmath>
#include <fstream>
+#include <map>
#include <sys/mman.h>
#include <tuple>
#include <unistd.h>
@@ -840,6 +841,17 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
const ControlInfoMap &controlsInfo = camera_->controls();
const ControlList &properties = camera_->properties();
+ std::map<camera_metadata_enum_android_request_available_capabilities, bool>
+ capabilities = {
+ { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE, true },
+ { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE, true },
+ { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR, true },
+ { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING, true },
+ { ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW, false },
+ };
+
+ bool fullSupport = true;
+
/* Color correction static metadata. */
{
std::vector<uint8_t> data;
@@ -1298,11 +1310,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
uint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;
staticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE, croppingType);
- /* Info static metadata. */
- uint8_t supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
- staticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,
- supportedHWLevel);
-
/* Request static metadata. */
int32_t partialResultCount = 1;
staticMetadata_->addEntry(ANDROID_REQUEST_PARTIAL_RESULT_COUNT,
@@ -1323,10 +1330,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
staticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,
maxNumInputStreams);
- std::vector<uint8_t> availableCapabilities = {
- ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,
- };
-
/* Report if camera supports RAW. */
bool rawStreamAvailable = false;
std::unique_ptr<CameraConfiguration> cameraConfig =
@@ -1338,7 +1341,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
if (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW &&
info.bitsPerPixel == 16) {
rawStreamAvailable = true;
- availableCapabilities.push_back(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW);
+ capabilities[ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW] = true;
}
}
@@ -1347,9 +1350,29 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
staticMetadata_->addEntry(ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,
numOutStreams);
+ /* Check capabilities */
+ std::vector<uint8_t> availableCapabilities;
+ for (auto cap : capabilities) {
+ if (cap.second)
+ availableCapabilities.push_back(cap.first);
+ }
staticMetadata_->addEntry(ANDROID_REQUEST_AVAILABLE_CAPABILITIES,
availableCapabilities);
+ uint8_t supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
+ if (capabilities[ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR] &&
+ capabilities[ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING] &&
+ capabilities[ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE] &&
+ fullSupport)
+ supportedHWLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL;
+ staticMetadata_->addEntry(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL,
+ supportedHWLevel);
+
+ LOG(HAL, Info)
+ << "Hardware level: "
+ << (supportedHWLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL
+ ? "FULL" : "LIMITED");
+
std::vector<int32_t> availableCharacteristicsKeys = {
ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,
ANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES,
Add the infrastructure for checking and reporting capabilities. Use these capabilities to determine the hardware level as well. Since the raw capability is set to true when support is determined to be available, leave that as default false and set to true, since copying the pattern of the other capabilities would cause redundant code. Note that this will cause CTS to fail, as we don't yet declare the lack of support for FULL based on the available controls. Bug: https://bugs.libcamera.org/show_bug.cgi?id=55 Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> --- This patch doesn't need to be reviewed. It's just here for dependency resolution. Changes in v3: - fix come compiler errors - go ahead and initialize the capabilities to true, update the commit message accordingly Changes in v2: - add a flag for FULL, since there are a few requirements that are not obtained from capabilities alone - add burst capture capability, since that is required for FULL as well This is my vision of how we would support the various capabilities. Although we don't have anything for FULL yet; I imagine that we would start the flags for manual sensor and manual post processing with true, and then if a required control is unavailable, then we would set the flag to false. I considered declaring an enum in CameraDevice to mirror the android ones, just for shorthand, but it seemed like a lot of code for not much gain. Unless the shorthand would be valuable because these constant names are so long? I think the available keys lists will have to be moved to the head of the function, and then as available controls are discovered add them to that list. --- src/android/camera_device.cpp | 43 +++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 10 deletions(-)