mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-11 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: clean up enum_params

Browse source
This commit is contained in:
Wim Taymans 2020-05-03 11:43:56 +02:00
parent 2efa3f00ac
commit 22cc1f903f
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pipewire/filter.c
View file

@ -470,14 +470,14 @@ static int impl_port_enum_params(void *object, int seq,
struct spa_result_node_params result; struct spa_result_node_params result;
uint8_t buffer[1024]; uint8_t buffer[1024];
struct spa_pod_builder b = { 0 }; struct spa_pod_builder b = { 0 };
uint32_t idx = 0, count = 0; uint32_t count = 0;
struct param *p; struct param *p;
bool found = false; bool found = false;
spa_return_val_if_fail(num != 0, -EINVAL); spa_return_val_if_fail(num != 0, -EINVAL);
result.id = id; result.id = id;
result.next = start; result.next = 0;
if ((port = get_port(d, direction, port_id)) == NULL) if ((port = get_port(d, direction, port_id)) == NULL)
return -EINVAL; return -EINVAL;
@ -489,8 +489,9 @@ static int impl_port_enum_params(void *object, int seq,
spa_list_for_each(p, &port->param_list, link) { spa_list_for_each(p, &port->param_list, link) {
struct spa_pod *param; struct spa_pod *param;
idx++;
result.index = result.next++; result.index = result.next++;
if (result.index < start)
continue;
param = p->param; param = p->param;
if (param == NULL || p->id != id) if (param == NULL || p->id != id)
@ -498,9 +499,6 @@ static int impl_port_enum_params(void *object, int seq,
found = true; found = true;
if (idx < start)
continue;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
if (spa_pod_filter(&b, &result.param, param, filter) != 0) if (spa_pod_filter(&b, &result.param, param, filter) != 0)
continue; continue;

10
src/pipewire/stream.c
View file

@ -496,14 +496,14 @@ static int impl_port_enum_params(void *object, int seq,
struct spa_result_node_params result; struct spa_result_node_params result;
uint8_t buffer[1024]; uint8_t buffer[1024];
struct spa_pod_builder b = { 0 }; struct spa_pod_builder b = { 0 };
uint32_t idx = 0, count = 0; uint32_t count = 0;
struct param *p; struct param *p;
bool found = false; bool found = false;
spa_return_val_if_fail(num != 0, -EINVAL); spa_return_val_if_fail(num != 0, -EINVAL);
result.id = id; result.id = id;
result.next = start; result.next = 0;
pw_log_debug(NAME" %p: param id %d (%s) start:%d num:%d", d, id, pw_log_debug(NAME" %p: param id %d (%s) start:%d num:%d", d, id,
spa_debug_type_find_name(spa_type_param, id), spa_debug_type_find_name(spa_type_param, id),
@ -512,8 +512,9 @@ static int impl_port_enum_params(void *object, int seq,
spa_list_for_each(p, &d->param_list, link) { spa_list_for_each(p, &d->param_list, link) {
struct spa_pod *param; struct spa_pod *param;
idx++;
result.index = result.next++; result.index = result.next++;
if (result.index < start)
continue;
param = p->param; param = p->param;
if (param == NULL || p->id != id) if (param == NULL || p->id != id)
@ -521,9 +522,6 @@ static int impl_port_enum_params(void *object, int seq,
found = true; found = true;
if (idx < start)
continue;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
if (spa_pod_filter(&b, &result.param, param, filter) != 0) if (spa_pod_filter(&b, &result.param, param, filter) != 0)
continue; continue;