Merge 93637bde3e32cdb3d6e090a5d350701536f9032f on remote branch
Change-Id: Ifb7feaa8891318b21957ab8d015cdcc15fcc3ee1
diff --git a/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl b/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl
new file mode 100644
index 0000000..4061d36
--- /dev/null
+++ b/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl
@@ -0,0 +1,34 @@
+/*
+ * {Copyright (c) 2023 Qualcomm Innovation Center, Inc.
+ * All rights reserved. SPDX-License-Identifier: BSD-3-Clause-Clear}
+ */
+///////////////////////////////////////////////////////////////////////////////
+// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
+///////////////////////////////////////////////////////////////////////////////
+
+// This file is a snapshot of an AIDL file. Do not edit it manually. There are
+// two cases:
+// 1). this is a frozen version file - do not edit this in any case.
+// 2). this is a 'current' file. If you make a backwards compatible change to
+// the interface (from the latest frozen version), the build system will
+// prompt you to update this file with `m <name>-update-api`.
+//
+// You must not make a backward incompatible change to any AIDL file built
+// with the aidl_interface module type with versions property set. The module
+// type is used to build AIDL files in a way that they can be used across
+// independently updatable components of the system. If a device is shipped
+// with such a backward incompatible change, it has a high risk of breaking
+// later when a module using the interface is updated, e.g., Mainline modules.
+
+package vendor.qti.hardware.camera.offlinecamera;
+@Backing(type="int") @VintfStability
+enum OfflineOpMode {
+ OfflineOpModeStart = 0x8000,
+ OpModeOfflineBayer2Yuv = 0x8001,
+ OpModeOfflineYuv2Jpeg = 0x8002,
+ OpModeOfflineYuv2Yuv = 0x8003,
+ OpModeOfflineQLL = 0x8004,
+ OpModeOfflineHWMF = 0x8005,
+ OpModeOfflineRaw2Raw = 0x8006,
+ OpModeOfflineRaw2Jpeg = 0x8007,
+}
diff --git a/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl b/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
index e15e9b8..f832846 100644
--- a/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
+++ b/camera/offlinecamera/aidl/aidl_api/vendor.qti.hardware.camera.offlinecamera/current/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
@@ -27,4 +27,5 @@
android.hardware.camera.device.Stream[] streams;
vendor.qti.hardware.camera.offlinecamera.OpMode mode;
android.hardware.camera.device.CameraMetadata configureSetting;
+ int opModes;
}
diff --git a/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl b/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl
new file mode 100644
index 0000000..d308e0e
--- /dev/null
+++ b/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineOpMode.aidl
@@ -0,0 +1,28 @@
+/*
+ * {Copyright (c) 2023 Qualcomm Innovation Center, Inc.
+ * All rights reserved. SPDX-License-Identifier: BSD-3-Clause-Clear}
+ */
+
+
+package vendor.qti.hardware.camera.offlinecamera;
+
+
+@VintfStability
+@Backing(type="int")
+enum OfflineOpMode {
+ OfflineOpModeStart = 0x8000,
+
+ OpModeOfflineBayer2Yuv = 0x8001,
+
+ OpModeOfflineYuv2Jpeg = 0x8002,
+
+ OpModeOfflineYuv2Yuv = 0x8003,
+
+ OpModeOfflineQLL = 0x8004,
+
+ OpModeOfflineHWMF = 0x8005,
+
+ OpModeOfflineRaw2Raw = 0x8006,
+
+ OpModeOfflineRaw2Jpeg = 0x8007,
+}
diff --git a/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl b/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
index f2402f4..f3fb465 100644
--- a/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
+++ b/camera/offlinecamera/aidl/vendor/qti/hardware/camera/offlinecamera/OfflineSessionConfigureInfo.aidl
@@ -17,7 +17,10 @@
Stream[] streams;
+ /*not used in V2*/
OpMode mode;
CameraMetadata configureSetting;
+
+ int opModes;
}