[libcamera-devel,2/2] android: camera_metadata: Report storage usages

Message ID 20200804113107.127257-3-kieran.bingham@ideasonboard.com
State Superseded
Delegated to: Kieran Bingham
Headers show
Series
  • android: metadata usage tracking
Related show

Commit Message

Kieran Bingham Aug. 4, 2020, 11:31 a.m. UTC
Report the actual usage of the containers used for camera_metadata.
This is particularly useful whilst we require manual pre-allocation of
the correctly determined size requirements.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/android/camera_device.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index 42b08cfc5fed..1a6ad81c6282 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -844,6 +844,8 @@  const camera_metadata_t *CameraDevice::getStaticMetadata()
 				  availableResultKeys.data(),
 				  availableResultKeys.size());
 
+	LOG(HAL, Debug) << "StaticMetadata usage: " << staticMetadata_->usage();
+
 	if (!staticMetadata_->isValid()) {
 		LOG(HAL, Error) << "Failed to construct static metadata";
 		delete staticMetadata_;
@@ -947,6 +949,8 @@  const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)
 	requestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,
 				  &captureIntent, 1);
 
+	LOG(HAL, Debug) << "requestTemplate usage: " << requestTemplate->usage();
+
 	if (!requestTemplate->isValid()) {
 		LOG(HAL, Error) << "Failed to construct request template";
 		delete requestTemplate;
@@ -1483,6 +1487,8 @@  std::unique_ptr<CameraMetadata> CameraDevice::getResultMetadata(int frame_number
 	resultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER,
 				 &scene_flicker, 1);
 
+	LOG(HAL, Debug) << "resultMetadata usage: " << resultMetadata->usage();
+
 	/*
 	 * Return the result metadata pack even is not valid: get() will return
 	 * nullptr.