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

pipewire: module-echo-cancel: avoid extra allocation

Browse source 
Use `pw_properties_setf()` instead of `calloc()` +
`sprintf()` + `pw_properties_set()` + `free()`.

Furthermore, check the return value of `sscanf()`.
This commit is contained in:
Barnabás Pőcze 2021-11-09 18:15:14 +01:00
parent c9fc3d7f42
commit 175efc4c1d
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-echo-cancel.c
View file

@ -954,7 +954,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
unsigned int factor = 0; unsigned int factor = 0;
unsigned int new_num = 0; unsigned int new_num = 0;
sscanf(impl->aec_info->latency, "%u/%u", &num, &denom); spa_assert_se(sscanf(impl->aec_info->latency, "%u/%u", &num, &denom) == 2);
if ((str = pw_properties_get(props, PW_KEY_NODE_LATENCY)) != NULL) { if ((str = pw_properties_get(props, PW_KEY_NODE_LATENCY)) != NULL) {
sscanf(str, "%u/%u", &req_num, &req_denom); sscanf(str, "%u/%u", &req_num, &req_denom);
@ -967,13 +967,9 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec_info->latency); pw_properties_set(props, PW_KEY_NODE_LATENCY, impl->aec_info->latency);
impl->aec_blocksize = sizeof(float) * impl->info.rate * num / denom; impl->aec_blocksize = sizeof(float) * impl->info.rate * num / denom;
} else { } else {
char* new_latency_str = (char*)calloc(strlen(str), sizeof(char)); pw_log_info("Setting node latency to %u/%u", new_num, req_denom);
pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%u/%u", new_num, req_denom);
sprintf(new_latency_str, "%u/%u", new_num, req_denom);
pw_log_info("Setting node latency to %s", new_latency_str);
pw_properties_set(props, PW_KEY_NODE_LATENCY, new_latency_str);
impl->aec_blocksize = sizeof(float) * impl->info.rate * num / denom * factor; impl->aec_blocksize = sizeof(float) * impl->info.rate * num / denom * factor;
free(new_latency_str);
} }
} else { } else {
/* Implementation doesn't care about the block size */ /* Implementation doesn't care about the block size */