diff options
Diffstat (limited to 'libavfilter/vf_aspect.c')
| -rw-r--r-- | libavfilter/vf_aspect.c | 80 |
1 files changed, 45 insertions, 35 deletions
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 3fe371482f..ab41becf68 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2010 Bobby Bingham - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,8 +26,10 @@ #include <float.h> #include "libavutil/common.h" +#include "libavutil/opt.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" +#include "libavutil/parseutils.h" #include "avfilter.h" #include "internal.h" @@ -36,6 +38,8 @@ typedef struct { const AVClass *class; AVRational aspect; + char *ratio_str; + int max; #if FF_API_OLD_FILTER_OPTS float aspect_num, aspect_den; #endif @@ -45,11 +49,26 @@ typedef struct { static av_cold int init(AVFilterContext *ctx, const char *args) { AspectContext *s = ctx->priv; + static const char *shorthand[] = { "ratio", "max", NULL }; + char c; + int ret; + AVRational q; + + if (args && sscanf(args, "%d:%d%c", &q.num, &q.den, &c) == 2) { + s->ratio_str = av_strdup(args); + av_log(ctx, AV_LOG_WARNING, + "num:den syntax is deprecated, please use num/den or named options instead\n"); + } else if ((ret = av_opt_set_from_string(s, args, shorthand, "=", ":")) < 0) { + return ret; + } - if (s->aspect_num > 0 && s->aspect_den > 0) { - av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use " - "dar=<number> or dar=num/den.\n"); - s->aspect = av_d2q(s->aspect_num / s->aspect_den, INT_MAX); + if (s->ratio_str) { + ret = av_parse_ratio(&s->aspect, s->ratio_str, s->max, 0, ctx); + if (ret < 0 || s->aspect.num < 0 || s->aspect.den <= 0) { + av_log(ctx, AV_LOG_ERROR, + "Invalid string '%s' for aspect ratio\n", args); + return AVERROR(EINVAL); + } } return 0; @@ -65,10 +84,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) } #define OFFSET(x) offsetof(AspectContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM #if CONFIG_SETDAR_FILTER -/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */ + static int setdar_config_props(AVFilterLink *inlink) { AspectContext *aspect = inlink->dst->priv; @@ -92,20 +111,14 @@ static int setdar_config_props(AVFilterLink *inlink) } static const AVOption setdar_options[] = { -#if FF_API_OLD_FILTER_OPTS - { "dar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS }, - { "dar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS }, -#endif - { "dar", "display aspect ratio", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, INT_MAX, FLAGS }, - { NULL }, + {"max", "set max value for nominator or denominator in the ratio", OFFSET(max), AV_OPT_TYPE_INT, {.i64=100}, 1, INT_MAX, FLAGS }, + {"ratio", "display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {"r", "display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {"dar", "display aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {NULL} }; -static const AVClass setdar_class = { - .class_name = "setdar", - .item_name = av_default_item_name, - .option = setdar_options, - .version = LIBAVUTIL_VERSION_INT, -}; +AVFILTER_DEFINE_CLASS(setdar); static const AVFilterPad avfilter_vf_setdar_inputs[] = { { @@ -141,10 +154,12 @@ AVFilter avfilter_vf_setdar = { .outputs = avfilter_vf_setdar_outputs, }; + #endif /* CONFIG_SETDAR_FILTER */ #if CONFIG_SETSAR_FILTER -/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */ + + static int setsar_config_props(AVFilterLink *inlink) { AspectContext *aspect = inlink->dst->priv; @@ -155,20 +170,14 @@ static int setsar_config_props(AVFilterLink *inlink) } static const AVOption setsar_options[] = { -#if FF_API_OLD_FILTER_OPTS - { "sar_num", NULL, OFFSET(aspect_num), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS }, - { "sar_den", NULL, OFFSET(aspect_den), AV_OPT_TYPE_FLOAT, { .dbl = 0 }, 0, FLT_MAX, FLAGS }, -#endif - { "sar", "sample (pixel) aspect ratio", OFFSET(aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 1 }, 0, INT_MAX, FLAGS }, - { NULL }, + {"max", "set max value for nominator or denominator in the ratio", OFFSET(max), AV_OPT_TYPE_INT, {.i64=100}, 1, INT_MAX, FLAGS }, + {"ratio", "sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {"r", "sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {"sar", "sample (pixel) aspect ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, + {NULL} }; -static const AVClass setsar_class = { - .class_name = "setsar", - .item_name = av_default_item_name, - .option = setsar_options, - .version = LIBAVUTIL_VERSION_INT, -}; +AVFILTER_DEFINE_CLASS(setsar); static const AVFilterPad avfilter_vf_setsar_inputs[] = { { @@ -204,4 +213,5 @@ AVFilter avfilter_vf_setsar = { .outputs = avfilter_vf_setsar_outputs, }; + #endif /* CONFIG_SETSAR_FILTER */ |