diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7f0f8f1a..c9d4afc3 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1596,8 +1596,9 @@ std::unique_ptr CameraDevice::requestTemplatePreview() /* * \todo Keep this in sync with the actual number of entries. * Currently: 20 entries, 35 bytes + * \todo how to split this with the functions that build off of this? */ - auto requestTemplate = std::make_unique(21, 36); + auto requestTemplate = std::make_unique(30, 65); if (!requestTemplate->isValid()) { return nullptr; } @@ -1653,6 +1654,9 @@ std::unique_ptr CameraDevice::requestTemplatePreview() requestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK, &awbLock, 1); + uint8_t edgeMode = ANDROID_EDGE_MODE_FAST; + requestTemplate->addEntry(ANDROID_EDGE_MODE, &edgeMode, 1); + uint8_t flashMode = ANDROID_FLASH_MODE_OFF; requestTemplate->addEntry(ANDROID_FLASH_MODE, &flashMode, 1); @@ -1661,7 +1665,8 @@ std::unique_ptr CameraDevice::requestTemplatePreview() requestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, &faceDetectMode, 1); - uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF; + /* \todo FULL expects this to be FAST, not OFF*/ + uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_FAST; requestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1); @@ -1683,6 +1688,35 @@ std::unique_ptr CameraDevice::requestTemplatePreview() requestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT, &captureIntent, 1); + int64_t exposureTime = 100000; + requestTemplate->addEntry(ANDROID_SENSOR_EXPOSURE_TIME, + &exposureTime, 1); + + int32_t sensorSensitivity = 32; + requestTemplate->addEntry(ANDROID_SENSOR_SENSITIVITY, + &sensorSensitivity, 1); + + bool blackLevelLock = false; + requestTemplate->addEntry(ANDROID_BLACK_LEVEL_LOCK, + &blackLevelLock, 1); + + /* Hardcode this. We ignore it if it comes in as a request key. */ + int64_t frameDuration = 33333333; + requestTemplate->addEntry(ANDROID_SENSOR_FRAME_DURATION, + &frameDuration, 1); + + uint8_t shadingMapMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF; + requestTemplate->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, + &shadingMapMode, 1); + + /* \todo handle this */ + uint8_t tonemapMode = ANDROID_TONEMAP_MODE_FAST; + requestTemplate->addEntry(ANDROID_TONEMAP_MODE, &tonemapMode, 1); + + /* \todo get this from request? and set it. handle map mode too */ + uint8_t shadingMode = ANDROID_SHADING_MODE_FAST; + requestTemplate->addEntry(ANDROID_SHADING_MODE, &shadingMode, 1); + return requestTemplate; } @@ -1700,6 +1734,9 @@ std::unique_ptr CameraDevice::requestTemplateVideo() staticMetadata_->getEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES, &entry); + uint8_t edgeMode = ANDROID_EDGE_MODE_FAST; + previewTemplate->updateEntry(ANDROID_EDGE_MODE, &edgeMode, 1); + /* * Assume the AE_AVAILABLE_TARGET_FPS_RANGE static metadata * has been assembled as {{min, max} {max, max}}. @@ -1710,6 +1747,58 @@ std::unique_ptr CameraDevice::requestTemplateVideo() return previewTemplate; } +std::unique_ptr CameraDevice::requestTemplateStill() +{ + std::unique_ptr previewTemplate = requestTemplatePreview(); + if (!previewTemplate) + return nullptr; + + /* + * The still template with FULL requires the noise reduction mode to be + * HIGH_QUALITY. + */ + uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY; + previewTemplate->updateEntry(ANDROID_NOISE_REDUCTION_MODE, + &noiseReduction, 1); + + uint8_t edgeMode = ANDROID_EDGE_MODE_HIGH_QUALITY; + previewTemplate->updateEntry(ANDROID_EDGE_MODE, &edgeMode, 1); + + uint8_t shadingMode = ANDROID_SHADING_MODE_HIGH_QUALITY; + previewTemplate->updateEntry(ANDROID_SHADING_MODE, &shadingMode, 1); + + uint8_t tonemapMode = ANDROID_TONEMAP_MODE_HIGH_QUALITY; + previewTemplate->updateEntry(ANDROID_TONEMAP_MODE, &tonemapMode, 1); + + return previewTemplate; +} + +std::unique_ptr CameraDevice::requestTemplateManual() +{ + std::unique_ptr previewTemplate = requestTemplatePreview(); + if (!previewTemplate) + return nullptr; + + uint8_t controlMode = ANDROID_CONTROL_MODE_OFF; + previewTemplate->updateEntry(ANDROID_CONTROL_MODE, &controlMode, 1); + + uint8_t aeMode = ANDROID_CONTROL_AE_MODE_OFF; + previewTemplate->updateEntry(ANDROID_CONTROL_AE_MODE, &aeMode, 1); + + uint8_t awbMode = ANDROID_CONTROL_AWB_MODE_OFF; + previewTemplate->updateEntry(ANDROID_CONTROL_AWB_MODE, &awbMode, 1); + + uint8_t edgeMode = ANDROID_EDGE_MODE_OFF; + previewTemplate->updateEntry(ANDROID_EDGE_MODE, &edgeMode, 1); + + /* \todo get this from available filter densities */ + float filterDensity = 0.0f; + previewTemplate->addEntry(ANDROID_LENS_FILTER_DENSITY, + &filterDensity, 1); + + return previewTemplate; +} + /* * Produce a metadata pack to be used as template for a capture request. */ @@ -1728,12 +1817,8 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) requestTemplate = requestTemplatePreview(); break; case CAMERA3_TEMPLATE_STILL_CAPTURE: - /* - * Use the preview template for still capture, they only differ - * for the torch mode we currently do not support. - */ captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE; - requestTemplate = requestTemplatePreview(); + requestTemplate = requestTemplateStill(); break; case CAMERA3_TEMPLATE_VIDEO_RECORD: captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD; @@ -1743,9 +1828,13 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT; requestTemplate = requestTemplateVideo(); break; + case CAMERA3_TEMPLATE_MANUAL: + /* required for FULL */ + captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL; + requestTemplate = requestTemplateManual(); + break; /* \todo Implement templates generation for the remaining use cases. */ case CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG: - case CAMERA3_TEMPLATE_MANUAL: default: LOG(HAL, Error) << "Unsupported template request type: " << type; return nullptr; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 23457e47..8edbcdfd 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -104,6 +104,8 @@ private: void notifyError(uint32_t frameNumber, camera3_stream_t *stream); std::unique_ptr requestTemplatePreview(); std::unique_ptr requestTemplateVideo(); + std::unique_ptr requestTemplateStill(); + std::unique_ptr requestTemplateManual(); libcamera::PixelFormat toPixelFormat(int format) const; int processControls(Camera3RequestDescriptor *descriptor); std::unique_ptr getResultMetadata(