From 552d4516b631caedf26a619356659d7e1e235e25 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 27 Oct 2022 19:20:40 +0200
Subject: [PATCH] params: count params per id from 0

Only increment the index when we find the requirested param, this
makes the params go from index 0 to the last instead of starting at some
random index. The random index is not really a problem but it is also
no so nice.
---
 src/pipewire/filter.c      | 8 ++++----
 src/pipewire/impl-device.c | 7 +++++--
 src/pipewire/impl-node.c   | 7 +++++--
 src/pipewire/impl-port.c   | 7 +++++--
 src/pipewire/stream.c      | 8 ++++----
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 334125ff4..4af39fbbe 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -419,16 +419,16 @@ static int enum_params(struct filter *d, struct spa_list *param_list, int seq,
 	spa_list_for_each(p, param_list, link) {
 		struct spa_pod *param;
 
-		result.index = result.next++;
-		if (result.index < start)
-			continue;
-
 		param = p->param;
 		if (param == NULL || p->id != id)
 			continue;
 
 		found = true;
 
+		result.index = result.next++;
+		if (result.index < start)
+			continue;
+
 		spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
 		if (spa_pod_filter(&b.b, &result.param, param, filter) == 0) {
 			spa_node_emit_result(&d->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
diff --git a/src/pipewire/impl-device.c b/src/pipewire/impl-device.c
index 188da6f9d..d44aefbfe 100644
--- a/src/pipewire/impl-device.c
+++ b/src/pipewire/impl-device.c
@@ -328,15 +328,18 @@ int pw_impl_device_for_each_param(struct pw_impl_device *device,
 		struct spa_pod_dynamic_builder b;
 	        struct spa_result_device_params result;
 		uint32_t count = 0;
+		bool found = false;
 
 		result.id = param_id;
 		result.next = 0;
 
 		spa_list_for_each(p, &impl->param_list, link) {
-			result.index = result.next++;
 			if (p->id != param_id)
 				continue;
 
+			found = true;
+
+			result.index = result.next++;
 			if (result.index < index)
 				continue;
 
@@ -351,7 +354,7 @@ int pw_impl_device_for_each_param(struct pw_impl_device *device,
 			if (count == max)
 				break;
 		}
-		res = 0;
+		res = found ? 0 : -ENOENT;
 	} else {
 		user_data.cache = impl->cache_params &&
 			(filter == NULL && index == 0 && max == UINT32_MAX);
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index 785b67adb..4bf9cfc3c 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -2015,15 +2015,18 @@ int pw_impl_node_for_each_param(struct pw_impl_node *node,
 		struct spa_pod_dynamic_builder b;
 	        struct spa_result_node_params result;
 		uint32_t count = 0;
+		bool found = false;
 
 		result.id = param_id;
 		result.next = 0;
 
 		spa_list_for_each(p, &impl->param_list, link) {
-			result.index = result.next++;
 			if (p->id != param_id)
 				continue;
 
+			found = true;
+
+			result.index = result.next++;
 			if (result.index < index)
 				continue;
 
@@ -2039,7 +2042,7 @@ int pw_impl_node_for_each_param(struct pw_impl_node *node,
 			if (count == max)
 				break;
 		}
-		res = 0;
+		res = found ? 0 : -ENOENT;
 	} else {
 		user_data.cache = impl->cache_params &&
 			(filter == NULL && index == 0 && max == UINT32_MAX);
diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c
index 8b0cb38b0..75fa70a81 100644
--- a/src/pipewire/impl-port.c
+++ b/src/pipewire/impl-port.c
@@ -1248,15 +1248,18 @@ int pw_impl_port_for_each_param(struct pw_impl_port *port,
 		struct spa_pod_dynamic_builder b;
 	        struct spa_result_node_params result;
 		uint32_t count = 0;
+		bool found = false;
 
 		result.id = param_id;
 		result.next = 0;
 
 		spa_list_for_each(p, &impl->param_list, link) {
-			result.index = result.next++;
 			if (p->id != param_id)
 				continue;
 
+			found = true;
+
+			result.index = result.next++;
 			if (result.index < index)
 				continue;
 
@@ -1272,7 +1275,7 @@ int pw_impl_port_for_each_param(struct pw_impl_port *port,
 			if (count == max)
 				break;
 		}
-		res = 0;
+		res = found ? 0 : -ENOENT;
 	} else {
 		user_data.cache = impl->cache_params &&
 			(filter == NULL && index == 0 && max == UINT32_MAX);
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 9ba438b6a..ee1246a2c 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -544,16 +544,16 @@ static int enum_params(void *object, bool is_port, int seq, uint32_t id, uint32_
 	spa_list_for_each(p, &d->param_list, link) {
 		struct spa_pod *param;
 
-		result.index = result.next++;
-		if (result.index < start)
-			continue;
-
 		param = p->param;
 		if (param == NULL || p->id != id)
 			continue;
 
 		found = true;
 
+		result.index = result.next++;
+		if (result.index < start)
+			continue;
+
 		spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
 		if (spa_pod_filter(&b.b, &result.param, param, filter) == 0) {
 			spa_node_emit_result(&d->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);