diff options
Diffstat (limited to 'libavfilter/vf_aspect.c')
| -rw-r--r-- | libavfilter/vf_aspect.c | 59 |
1 files changed, 22 insertions, 37 deletions
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 65dc364ed8..eeaa8870ef 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 */ @@ -24,43 +24,30 @@ */ #include "libavutil/mathematics.h" +#include "libavutil/parseutils.h" #include "avfilter.h" #include "internal.h" #include "video.h" typedef struct { - AVRational aspect; + AVRational ratio; } AspectContext; static av_cold int init(AVFilterContext *ctx, const char *args) { AspectContext *aspect = ctx->priv; - double ratio; - int64_t gcd; - char c = 0; + aspect->ratio = (AVRational) {0, 1}; if (args) { - if (sscanf(args, "%d:%d%c", &aspect->aspect.num, &aspect->aspect.den, &c) != 2) - if (sscanf(args, "%lf%c", &ratio, &c) == 1) - aspect->aspect = av_d2q(ratio, 100); - - if (c || aspect->aspect.num <= 0 || aspect->aspect.den <= 0) { + if (av_parse_ratio(&aspect->ratio, args, 100, 0, ctx) < 0 || + aspect->ratio.num < 0 || aspect->ratio.den <= 0) { av_log(ctx, AV_LOG_ERROR, "Invalid string '%s' for aspect ratio.\n", args); return AVERROR(EINVAL); } - - gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den)); - if (gcd) { - aspect->aspect.num /= gcd; - aspect->aspect.den /= gcd; - } } - if (aspect->aspect.den == 0) - aspect->aspect = (AVRational) {0, 1}; - - av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den); + av_log(ctx, AV_LOG_INFO, "a:%d/%d\n", aspect->ratio.num, aspect->ratio.den); return 0; } @@ -68,25 +55,24 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) { AspectContext *aspect = link->dst->priv; - picref->video->pixel_aspect = aspect->aspect; + picref->video->sample_aspect_ratio = aspect->ratio; ff_start_frame(link->dst->outputs[0], picref); } #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; - AVRational dar = aspect->aspect; + AVRational dar = aspect->ratio; - av_reduce(&aspect->aspect.num, &aspect->aspect.den, - aspect->aspect.num * inlink->h, - aspect->aspect.den * inlink->w, 100); + av_reduce(&aspect->ratio.num, &aspect->ratio.den, + aspect->ratio.num * inlink->h, + aspect->ratio.den * inlink->w, 100); av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n", - inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den); + inlink->w, inlink->h, dar.num, dar.den, aspect->ratio.num, aspect->ratio.den); - inlink->sample_aspect_ratio = aspect->aspect; + inlink->sample_aspect_ratio = aspect->ratio; return 0; } @@ -99,7 +85,7 @@ AVFilter avfilter_vf_setdar = { .priv_size = sizeof(AspectContext), - .inputs = (AVFilterPad[]) {{ .name = "default", + .inputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = setdar_config_props, .get_video_buffer = ff_null_get_video_buffer, @@ -107,19 +93,18 @@ AVFilter avfilter_vf_setdar = { .end_frame = ff_null_end_frame }, { .name = NULL}}, - .outputs = (AVFilterPad[]) {{ .name = "default", + .outputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; #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; - inlink->sample_aspect_ratio = aspect->aspect; + inlink->sample_aspect_ratio = aspect->ratio; return 0; } @@ -132,7 +117,7 @@ AVFilter avfilter_vf_setsar = { .priv_size = sizeof(AspectContext), - .inputs = (AVFilterPad[]) {{ .name = "default", + .inputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = setsar_config_props, .get_video_buffer = ff_null_get_video_buffer, @@ -140,7 +125,7 @@ AVFilter avfilter_vf_setsar = { .end_frame = ff_null_end_frame }, { .name = NULL}}, - .outputs = (AVFilterPad[]) {{ .name = "default", + .outputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; |