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

spa: add locale independent spa_dtoa

Browse source 
And use this in spa_json_format_float() where we also avoid invalid
json floats.
Use json float format in some places where we serialize json floats.
Add a unit test.

See #2223
This commit is contained in:
Wim Taymans 2022-03-21 10:41:44 +01:00
parent 5f4d031db0
commit 2b16df4e89
6 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
spa/include/spa/utils/json.h
View file

@ -258,14 +258,17 @@ static inline int spa_json_get_float(struct spa_json *iter, float *res)
return spa_json_parse_float(value, len, res);
}
static inline char *spa_json_format_double(char *str, int size, const double val)
static inline char *spa_json_format_float(char *str, int size, float val)
{
int i, l;
l = snprintf(str, size, "%f", val);
for (i = 0; i < l; i++)
if (str[i] == ',')
str[i] = '.';
return str;
if (SPA_UNLIKELY(!isnormal(val))) {
if (val == INFINITY)
val = FLT_MAX;
else if (val == -INFINITY)
val = FLT_MIN;
else
val = 0.0f;
}
return spa_dtoa(str, size, val);
}
/* int */

10
spa/include/spa/utils/string.h
View file

@ -354,6 +354,16 @@ static inline bool spa_atod(const char *str, double *val)
return true;
}
static inline char *spa_dtoa(char *str, size_t size, double val)
{
int i, l;
l = spa_scnprintf(str, size, "%f", val);
for (i = 0; i < l; i++)
if (str[i] == ',')
str[i] = '.';
return str;
}
/**
* \}
*/

7
spa/plugins/audioconvert/channelmix.c
View file

@ -695,7 +695,7 @@ static int parse_prop_params(struct impl *this, struct spa_pod *params)
while (true) {
const char *name;
struct spa_pod *pod;
char value[512];
char value[512], buf[128];
if (spa_pod_parser_get_string(&prs, &name) < 0)
break;
@ -706,8 +706,9 @@ static int parse_prop_params(struct impl *this, struct spa_pod *params)
if (spa_pod_is_string(pod)) {
spa_pod_copy_string(pod, sizeof(value), value);
} else if (spa_pod_is_float(pod)) {
snprintf(value, sizeof(value), "%f",
SPA_POD_VALUE(struct spa_pod_float, pod));
snprintf(value, sizeof(value), "%s",
spa_json_format_float(buf, sizeof(buf),
SPA_POD_VALUE(struct spa_pod_float, pod)));
} else if (spa_pod_is_int(pod)) {
snprintf(value, sizeof(value), "%d",
SPA_POD_VALUE(struct spa_pod_int, pod));