commit 314c17b877140eeb64e8183aee082a75d5a1a05a
author Rohit Sekhar <git@merothh.com> Wed Sep 20 17:46:13 2023 +0530
committer micky387 <mickaelsaibi@free.fr> Mon Oct 07 17:12:52 2024 -0400
tree 73acaa74a0a17af2402783b91b3f57479828a5ee
parent f2df335ce8d7339c40e249f02c1d446a6e89052d

camera: Make overrideFormat from reserved fields opt-in

Change-Id: Ic0025ae5a4d359074e25692e1913eb98f47bbcec

camera/device/3.3/default/Android.bp

diff --git a/camera/device/3.3/default/Android.bp b/camera/device/3.3/default/Android.bp
index 5bc2b51..32bbdf6 100644
--- a/camera/device/3.3/default/Android.bp
+++ b/camera/device/3.3/default/Android.bp
@@ -10,7 +10,10 @@
 
 cc_library_shared {
     name: "camera.device@3.3-impl",
-    defaults: ["hidl_defaults"],
+    defaults: [
+        "hidl_defaults",
+        "camera_override_format_from_reserved_defaults",
+    ],
     proprietary: true,
     srcs: [
         "CameraDevice.cpp",

camera/device/3.3/default/convert.cpp

diff --git a/camera/device/3.3/default/convert.cpp b/camera/device/3.3/default/convert.cpp
index ac17d83..9b6caf0 100644
--- a/camera/device/3.3/default/convert.cpp
+++ b/camera/device/3.3/default/convert.cpp
@@ -48,6 +48,7 @@
                 __FUNCTION__, src->stream_type);
     }
 
+#ifdef TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED
     HalStream* halStream = NULL;
     if (src->reserved[0] != NULL) {
         halStream = (HalStream*)(src->reserved[0]);
@@ -63,6 +64,7 @@
             dst->v3_2.consumerUsage = (BufferUsageFlags)halStream->v3_2.consumerUsage;
         }
     }
+#endif
 }
 
 void convertToHidl(const camera3_stream_configuration_t& src, HalStreamConfiguration* dst) {