libcamera: controls: Avoid double lookups

Now that the ControlList::get() function returns an instance of
std::optional<>, we can replace the ControlList::contains() calls with a
nullopt check on the return value of get(). This avoids double lookups
of controls through the code base.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp
index 0bffe96f..7512cc4e 100644
--- a/src/android/camera_hal_manager.cpp
+++ b/src/android/camera_hal_manager.cpp
@@ -228,11 +228,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr<Camera> cam)
 
 int32_t CameraHalManager::cameraLocation(const Camera *cam)
 {
-	const ControlList &properties = cam->properties();
-	if (!properties.contains(properties::Location))
-		return -1;
-
-	return *properties.get(properties::Location);
+	return cam->properties().get(properties::Location).value_or(-1);
 }
 
 CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)