audioconvert: fix compilation warnings

This commit is contained in:
Wim Taymans 2022-07-17 13:15:00 +02:00
parent a4db745a7e
commit 9dbd016f9d

View file

@ -643,7 +643,7 @@ static int impl_node_enum_params(void *object, int seq,
0); 0);
spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0); spa_pod_builder_prop(&b, SPA_PROP_INFO_labels, 0);
spa_pod_builder_push_struct(&b, &f[1]); spa_pod_builder_push_struct(&b, &f[1]);
for (i = 0; i < SPA_N_ELEMENTS(channelmix_upmix_info); i++) { for (i = 0; i < SPA_N_ELEMENTS(dither_method_info); i++) {
spa_pod_builder_string(&b, dither_method_info[i].label); spa_pod_builder_string(&b, dither_method_info[i].label);
spa_pod_builder_string(&b, dither_method_info[i].description); spa_pod_builder_string(&b, dither_method_info[i].description);
} }
@ -719,7 +719,7 @@ static int impl_node_enum_params(void *object, int seq,
spa_pod_builder_string(&b, "resample.disable"); spa_pod_builder_string(&b, "resample.disable");
spa_pod_builder_bool(&b, p->resample_disabled); spa_pod_builder_bool(&b, p->resample_disabled);
spa_pod_builder_string(&b, "dither.noise"); spa_pod_builder_string(&b, "dither.noise");
spa_pod_builder_int(&b, this->dir[1].conv.noise); spa_pod_builder_int(&b, this->dir[1].conv.noise_bits);
spa_pod_builder_string(&b, "dither.method"); spa_pod_builder_string(&b, "dither.method");
spa_pod_builder_string(&b, dither_method_info[this->dir[1].conv.method].label); spa_pod_builder_string(&b, dither_method_info[this->dir[1].conv.method].label);
spa_pod_builder_pop(&b, &f[1]); spa_pod_builder_pop(&b, &f[1]);
@ -792,7 +792,7 @@ static int audioconvert_set_param(struct impl *this, const char *k, const char *
else if (spa_streq(k, "resample.disable")) else if (spa_streq(k, "resample.disable"))
this->props.resample_disabled = spa_atob(s); this->props.resample_disabled = spa_atob(s);
else if (spa_streq(k, "dither.noise")) else if (spa_streq(k, "dither.noise"))
spa_atou32(s, &this->dir[1].conv.noise, 0); spa_atou32(s, &this->dir[1].conv.noise_bits, 0);
else if (spa_streq(k, "dither.method")) else if (spa_streq(k, "dither.method"))
this->dir[1].conv.method = dither_method_from_label(s); this->dir[1].conv.method = dither_method_from_label(s);
else else
@ -1452,7 +1452,7 @@ static int setup_out_convert(struct impl *this)
spa_log_debug(this->log, "%p: got converter features %08x:%08x quant:%d:%d" spa_log_debug(this->log, "%p: got converter features %08x:%08x quant:%d:%d"
" passthrough:%d remap:%d %s", this, " passthrough:%d remap:%d %s", this,
this->cpu_flags, out->conv.cpu_flags, out->conv.method, this->cpu_flags, out->conv.cpu_flags, out->conv.method,
out->conv.noise, out->conv.is_passthrough, remap, out->conv.func_name); out->conv.noise_bits, out->conv.is_passthrough, remap, out->conv.func_name);
return 0; return 0;
} }