Commit f4946472 authored by Stefano Sabatini's avatar Stefano Sabatini

lavu/opt: change the way ranges are printed

parent f2c49da9
...@@ -750,7 +750,7 @@ static void log_value(void *av_log_obj, int level, double d) ...@@ -750,7 +750,7 @@ static void log_value(void *av_log_obj, int level, double d)
} else if (d == FLT_MIN) { } else if (d == FLT_MIN) {
av_log(av_log_obj, level, "FLT_MIN"); av_log(av_log_obj, level, "FLT_MIN");
} else { } else {
av_log(av_log_obj, level, "%7.2g", d); av_log(av_log_obj, level, "%g", d);
} }
} }
...@@ -826,6 +826,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, ...@@ -826,6 +826,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.'); av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM ) ? 'A' : '.');
av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.'); av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
if (opt->help)
av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) {
switch (opt->type) { switch (opt->type) {
case AV_OPT_TYPE_INT: case AV_OPT_TYPE_INT:
...@@ -833,20 +836,18 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, ...@@ -833,20 +836,18 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_DOUBLE:
case AV_OPT_TYPE_FLOAT: case AV_OPT_TYPE_FLOAT:
case AV_OPT_TYPE_RATIONAL: case AV_OPT_TYPE_RATIONAL:
for (i = 0; i <r->nb_ranges; i++) { for (i = 0; i < r->nb_ranges; i++) {
av_log(av_log_obj, AV_LOG_INFO, "["); av_log(av_log_obj, AV_LOG_INFO, " (from ");
log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_min); log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_min);
av_log(av_log_obj, AV_LOG_INFO, ", "); av_log(av_log_obj, AV_LOG_INFO, " to ");
log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_max); log_value(av_log_obj, AV_LOG_INFO, r->range[i]->value_max);
av_log(av_log_obj, AV_LOG_INFO, "]"); av_log(av_log_obj, AV_LOG_INFO, ")");
} }
break; break;
} }
av_opt_freep_ranges(&r); av_opt_freep_ranges(&r);
} }
if (opt->help)
av_log(av_log_obj, AV_LOG_INFO, " %s", opt->help);
av_log(av_log_obj, AV_LOG_INFO, "\n"); av_log(av_log_obj, AV_LOG_INFO, "\n");
if (opt->unit && opt->type != AV_OPT_TYPE_CONST) { if (opt->unit && opt->type != AV_OPT_TYPE_CONST) {
opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags); opt_list(obj, av_log_obj, opt->unit, req_flags, rej_flags);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment