commit 8ca3c60f5cb03e0b8935eafc212df8061ad1141b
author Emilian Peev <epeev@google.com> Mon Oct 29 09:37:04 2018 +0000
committer Emilian Peev <epeev@google.com> Fri Nov 09 14:14:03 2018 +0000
tree 69fbc39f15778b169f719ba889b47f3263e7cc82
parent 2d8649c1dc514b82d355b9e340681bcdac33a207

Camera: Add camera module support for stream combination query

Add necessary API to support stream combination query.
This will be used in case Hal supports the new 2.5 module
API.

Bug: 111593096
Test: Camera VTS
Change-Id: I916dcbd585e07be16f2f07da0076fb68039d6a00

tests/hardware/struct-offset.cpp

diff --git a/tests/hardware/struct-offset.cpp b/tests/hardware/struct-offset.cpp
index 8ec1a27..f8bb8b8 100644
--- a/tests/hardware/struct-offset.cpp
+++ b/tests/hardware/struct-offset.cpp
@@ -217,7 +217,8 @@
     CHECK_MEMBER_AT(camera_module_t, set_torch_mode, 148, 288);
     CHECK_MEMBER_AT(camera_module_t, init, 152, 296);
     CHECK_MEMBER_AT(camera_module_t, get_physical_camera_info, 156, 304);
-    CHECK_MEMBER_AT(camera_module_t, reserved, 160, 312);
+    CHECK_MEMBER_AT(camera_module_t, is_stream_combination_supported, 160, 312);
+    CHECK_MEMBER_AT(camera_module_t, reserved, 164, 320);
 
     //Types defined in camera3.h
     CHECK_MEMBER_AT(camera3_device_ops_t, initialize, 0, 0);