diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-05-20 13:53:19 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-05-20 18:24:20 +0200 |
| commit | 2ec3e5767e7bb7f089c22f7fba7becc32eef8394 (patch) | |
| tree | 2e5890eb4a459bcf8bf21efb603e7b4bde471e3c | |
| parent | f7985f348f1eb3ec6a1670bc1accfe2c80b55148 (diff) | |
| download | ffmpeg-2ec3e5767e7bb7f089c22f7fba7becc32eef8394.tar.gz | |
opt: add AV_OPT_TYPE_IMAGE_SIZE.
| -rw-r--r-- | libavutil/opt.c | 14 | ||||
| -rw-r--r-- | libavutil/opt.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index e14ace9b64..3f4a5fe957 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -31,6 +31,7 @@ #include "eval.h" #include "dict.h" #include "log.h" +#include "parseutils.h" #if FF_API_FIND_OPT //FIXME order them and do a bin search @@ -224,6 +225,7 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons int av_opt_set(void *obj, const char *name, const char *val, int search_flags) { + int ret; void *dst, *target_obj; const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); if (!o || !target_obj) @@ -241,6 +243,11 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) case AV_OPT_TYPE_FLOAT: case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, o, val, dst); + case AV_OPT_TYPE_IMAGE_SIZE: + ret = av_parse_video_size(dst, ((int *)dst) + 1, val); + if (ret < 0) + av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val); + return ret; } av_log(obj, AV_LOG_ERROR, "Invalid option type.\n"); @@ -394,6 +401,9 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) for (i = 0; i < len; i++) snprintf(*out_val + i*2, 3, "%02X", bin[i]); return 0; + case AV_OPT_TYPE_IMAGE_SIZE: + ret = snprintf(buf, sizeof(buf), "%dx%d", ((int *)dst)[0], ((int *)dst)[1]); + break; default: return AVERROR(EINVAL); } @@ -563,6 +573,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, case AV_OPT_TYPE_BINARY: av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>"); break; + case AV_OPT_TYPE_IMAGE_SIZE: + av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<image_size>"); + break; case AV_OPT_TYPE_CONST: default: av_log(av_log_obj, AV_LOG_INFO, "%-7s ", ""); @@ -640,6 +653,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags) } break; case AV_OPT_TYPE_STRING: + case AV_OPT_TYPE_IMAGE_SIZE: av_opt_set(s, opt->name, opt->default_val.str, 0); break; case AV_OPT_TYPE_BINARY: diff --git a/libavutil/opt.h b/libavutil/opt.h index 436f1963ca..1b1ebe2e41 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -225,6 +225,7 @@ enum AVOptionType{ AV_OPT_TYPE_RATIONAL, AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length AV_OPT_TYPE_CONST = 128, + AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers #if FF_API_OLD_AVOPTIONS FF_OPT_TYPE_FLAGS = 0, FF_OPT_TYPE_INT, |