[PATCH] libcamera: mtkisp7: Change ipa_control_value_entry.count to 32 bits

Harvey Yang chenghaoyang at chromium.org
Fri Oct 18 09:52:37 CEST 2024


From: Xing-Gu Chen <xinggu at chromium.org>

Change ipa_control_value_entry.count to uint32_t because the
element count of JpegApplicationSegmentContent is bigger than
65536.

Signed-off-by: Xing-Gu Chen <xinggu at chromium.org>
Co-developed-by: Harvey Yang <chenghaoyang at chromium.org>
Signed-off-by: Harvey Yang <chenghaoyang at chromium.org>
---
 include/libcamera/ipa/ipa_controls.h | 2 +-
 src/libcamera/ipa_controls.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/libcamera/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h
index 5fd13394f..7a8051695 100644
--- a/include/libcamera/ipa/ipa_controls.h
+++ b/include/libcamera/ipa/ipa_controls.h
@@ -37,7 +37,7 @@ struct ipa_control_value_entry {
 	uint32_t id;
 	uint8_t type;
 	uint8_t is_array;
-	uint16_t count;
+	uint32_t count;
 	uint32_t offset;
 	uint32_t padding[1];
 };
diff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp
index 9420c889f..a1ccc7d61 100644
--- a/src/libcamera/ipa_controls.cpp
+++ b/src/libcamera/ipa_controls.cpp
@@ -207,7 +207,7 @@ static_assert(sizeof(ipa_controls_header) == 32,
  * Padding bytes (shall be set to 0)
  */
 
-static_assert(sizeof(ipa_control_value_entry) == 16,
+static_assert(sizeof(ipa_control_value_entry) == 20,
 	      "Invalid ABI size change for struct ipa_control_value_entry");
 
 /**
-- 
2.47.0.rc1.288.g06298d1525-goog



More information about the libcamera-devel mailing list