| Message ID | MN2PR13MB2752034E3FE8C807B478406DBA8F0@MN2PR13MB2752.namprd13.prod.outlook.com |
|---|---|
| State | Superseded |
| Headers | show |
On 9/16/2019 10:07 PM, Soft Works wrote: > Integer values should not be printed using format specifier '%g' which leads to inexact display in case of higher values. > > Before this patch: > -trans_color <int> .D.V..... color value [...] (default 1.67772e+07) > > Afterwards: > -trans_color <int> .D.V..... color value [...] (default 16777215) > Signed-off-by: softworkz <softworkz@hotmail.com> > --- > libavutil/opt.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/libavutil/opt.c b/libavutil/opt.c > index 93d6c26c11..01530394e1 100644 > --- a/libavutil/opt.c > +++ b/libavutil/opt.c > @@ -1034,6 +1034,23 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) > return res & flag->default_val.i64; > } > > +static void log_int_value(void *av_log_obj, int level, int64_t i) > +{ > + if (i == INT_MAX) { > + av_log(av_log_obj, level, "INT_MAX"); > + } else if (i == INT_MIN) { > + av_log(av_log_obj, level, "INT_MIN"); > + } else if (i == UINT32_MAX) { > + av_log(av_log_obj, level, "UINT32_MAX"); > + } else if (i == INT64_MAX) { > + av_log(av_log_obj, level, "I64_MAX"); > + } else if (i == INT64_MIN) { > + av_log(av_log_obj, level, "I64_MIN"); > + } else { > + av_log(av_log_obj, level, "%d", i); This should be PRId64. > + } > +} > + > static void log_value(void *av_log_obj, int level, double d) > { > if (d == INT_MAX) { > @@ -1254,7 +1271,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, > if (def_const) > av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); > else > - log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); > + log_int_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); > break; > } > case AV_OPT_TYPE_DOUBLE: >
diff --git a/libavutil/opt.c b/libavutil/opt.c index 93d6c26c11..01530394e1 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1034,6 +1034,23 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) return res & flag->default_val.i64; } +static void log_int_value(void *av_log_obj, int level, int64_t i) +{ + if (i == INT_MAX) { + av_log(av_log_obj, level, "INT_MAX"); + } else if (i == INT_MIN) { + av_log(av_log_obj, level, "INT_MIN"); + } else if (i == UINT32_MAX) { + av_log(av_log_obj, level, "UINT32_MAX"); + } else if (i == INT64_MAX) { + av_log(av_log_obj, level, "I64_MAX"); + } else if (i == INT64_MIN) { + av_log(av_log_obj, level, "I64_MIN"); + } else { + av_log(av_log_obj, level, "%d", i); + } +} + static void log_value(void *av_log_obj, int level, double d) { if (d == INT_MAX) { @@ -1254,7 +1271,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, if (def_const) av_log(av_log_obj, AV_LOG_INFO, "%s", def_const); else - log_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); + log_int_value(av_log_obj, AV_LOG_INFO, opt->default_val.i64); break; } case AV_OPT_TYPE_DOUBLE:
Integer values should not be printed using format specifier '%g' which leads to inexact display in case of higher values. Before this patch: -trans_color <int> .D.V..... color value [...] (default 1.67772e+07) Afterwards: -trans_color <int> .D.V..... color value [...] (default 16777215) Signed-off-by: softworkz <softworkz@hotmail.com> --- libavutil/opt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)