generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

opt: add AV_OPT_TYPE_IMAGE_SIZE.

Browse Source
This commit is contained in:
Nicolas George 2012-05-20 13:53:19 +02:00
parent f7985f348f
commit 2ec3e5767e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/opt.c
View File

@ -31,6 +31,7 @@
#include "eval.h" #include "eval.h"
#include "dict.h" #include "dict.h"
#include "log.h" #include "log.h"
#include "parseutils.h"
#if FF_API_FIND_OPT #if FF_API_FIND_OPT
//FIXME order them and do a bin search //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 av_opt_set(void *obj, const char *name, const char *val, int search_flags)
{ {
int ret;
void *dst, *target_obj; void *dst, *target_obj;
const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj);
if (!o || !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_FLOAT:
case AV_OPT_TYPE_DOUBLE: case AV_OPT_TYPE_DOUBLE:
case AV_OPT_TYPE_RATIONAL: return set_string_number(obj, o, val, dst); 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"); 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++) for (i = 0; i < len; i++)
snprintf(*out_val + i*2, 3, "%02X", bin[i]); snprintf(*out_val + i*2, 3, "%02X", bin[i]);
return 0; return 0;
case AV_OPT_TYPE_IMAGE_SIZE:
ret = snprintf(buf, sizeof(buf), "%dx%d", ((int *)dst)[0], ((int *)dst)[1]);
break;
default: default:
return AVERROR(EINVAL); 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: case AV_OPT_TYPE_BINARY:
av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>"); av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<binary>");
break; break;
case AV_OPT_TYPE_IMAGE_SIZE:
av_log(av_log_obj, AV_LOG_INFO, "%-7s ", "<image_size>");
break;
case AV_OPT_TYPE_CONST: case AV_OPT_TYPE_CONST:
default: default:
av_log(av_log_obj, AV_LOG_INFO, "%-7s ", ""); 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; break;
case AV_OPT_TYPE_STRING: case AV_OPT_TYPE_STRING:
case AV_OPT_TYPE_IMAGE_SIZE:
av_opt_set(s, opt->name, opt->default_val.str, 0); av_opt_set(s, opt->name, opt->default_val.str, 0);
break; break;
case AV_OPT_TYPE_BINARY: case AV_OPT_TYPE_BINARY:

1
libavutil/opt.h
View File

@ -225,6 +225,7 @@ enum AVOptionType{
AV_OPT_TYPE_RATIONAL, 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_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
AV_OPT_TYPE_CONST = 128, 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 #if FF_API_OLD_AVOPTIONS
FF_OPT_TYPE_FLAGS = 0, FF_OPT_TYPE_FLAGS = 0,
FF_OPT_TYPE_INT, FF_OPT_TYPE_INT,