From e5afc939e8d053e3331e401f29bdc9913bf200f0 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sat, 17 May 2025 14:05:23 +0200
Subject: [PATCH] libcemara: take care of index offset when enumerating
 controls

Add an index offset when enumerating controls. We insert 2 properties
before enumerating the controls so the index of the first control needs
to have an offset of 2.
---
 spa/plugins/libcamera/libcamera-source.cpp | 4 ++--
 spa/plugins/libcamera/libcamera-utils.cpp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp
index f570499d1..0dffbc92b 100644
--- a/spa/plugins/libcamera/libcamera-source.cpp
+++ b/spa/plugins/libcamera/libcamera-source.cpp
@@ -273,7 +273,7 @@ next:
 		default:
 			return spa_libcamera_enum_controls(impl,
 					GET_OUT_PORT(impl, 0),
-					seq, result.index - 2, num, filter);
+					seq, result.index, 2, num, filter);
 		}
 		break;
 	}
@@ -535,7 +535,7 @@ next:
 
 	switch (id) {
 	case SPA_PARAM_PropInfo:
-		return spa_libcamera_enum_controls(impl, port, seq, start, num, filter);
+		return spa_libcamera_enum_controls(impl, port, seq, start, 0, num, filter);
 
 	case SPA_PARAM_EnumFormat:
 		return spa_libcamera_enum_format(impl, port, seq, start, num, filter);
diff --git a/spa/plugins/libcamera/libcamera-utils.cpp b/spa/plugins/libcamera/libcamera-utils.cpp
index 92185c4b0..bbd351afe 100644
--- a/spa/plugins/libcamera/libcamera-utils.cpp
+++ b/spa/plugins/libcamera/libcamera-utils.cpp
@@ -495,7 +495,7 @@ static uint32_t prop_id_to_control(struct impl *impl, uint32_t prop_id)
 
 static int
 spa_libcamera_enum_controls(struct impl *impl, struct port *port, int seq,
-		       uint32_t start, uint32_t num,
+		       uint32_t start, uint32_t offset, uint32_t num,
 		       const struct spa_pod *filter)
 {
 	const ControlInfoMap &info = impl->camera->controls();
@@ -513,7 +513,7 @@ spa_libcamera_enum_controls(struct impl *impl, struct port *port, int seq,
 	result.next = start;
 
 	auto it = info.begin();
-	for (skip = result.next; skip; skip--)
+	for (skip = result.next - offset; skip; skip--)
 		it++;
 
 	if (false) {