X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_aspect.c;h=9db29c70f5c4569edd0a480cc2640bb165dfec9c;hb=fd127ede62306b273de925489c78d48474438b31;hp=bd186493021e6d799cf0434335f1807e8aa2a248;hpb=ecc8dada379261b8ad3788336cdc9d15de55b64b;p=ffmpeg diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index bd186493021..9db29c70f5c 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -1,29 +1,29 @@ /* - * Aspect ratio modification video filter * Copyright (c) 2010 Bobby Bingham - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** * @file - * aspect ratio modification video filter + * aspect ratio modification video filters */ +#include "libavutil/mathematics.h" #include "avfilter.h" typedef struct { @@ -35,24 +35,30 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) AspectContext *aspect = ctx->priv; double ratio; int64_t gcd; + char c = 0; - if(args) { - if(sscanf(args, "%d:%d", &aspect->aspect.num, &aspect->aspect.den) < 2) { - if(sscanf(args, "%lf", &ratio) < 1) - return -1; - aspect->aspect = av_d2q(ratio, 100); - } else { - gcd = av_gcd(FFABS(aspect->aspect.num), FFABS(aspect->aspect.den)); - if(gcd) { - aspect->aspect.num /= gcd; - aspect->aspect.den /= gcd; - } + 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) { + 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) + 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); return 0; } @@ -60,26 +66,32 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) { AspectContext *aspect = link->dst->priv; - picref->pixel_aspect = aspect->aspect; + picref->video->pixel_aspect = aspect->aspect; avfilter_start_frame(link->dst->outputs[0], picref); } -#if CONFIG_ASPECT_FILTER -/* for aspect filter, convert from frame aspect ratio to pixel aspect ratio */ -static int frameaspect_config_props(AVFilterLink *inlink) +#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; av_reduce(&aspect->aspect.num, &aspect->aspect.den, aspect->aspect.num * inlink->h, aspect->aspect.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->sample_aspect_ratio = aspect->aspect; + return 0; } -AVFilter avfilter_vf_aspect = { - .name = "aspect", - .description = NULL_IF_CONFIG_SMALL("Set the frame aspect ratio."), +AVFilter avfilter_vf_setdar = { + .name = "setdar", + .description = NULL_IF_CONFIG_SMALL("Set the frame display aspect ratio."), .init = init, @@ -87,7 +99,7 @@ AVFilter avfilter_vf_aspect = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = frameaspect_config_props, + .config_props = setdar_config_props, .get_video_buffer = avfilter_null_get_video_buffer, .start_frame = start_frame, .end_frame = avfilter_null_end_frame }, @@ -97,12 +109,22 @@ AVFilter avfilter_vf_aspect = { .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; -#endif /* CONFIG_ASPECT_FILTER */ +#endif /* CONFIG_SETDAR_FILTER */ -#if CONFIG_PIXELASPECT_FILTER -AVFilter avfilter_vf_pixelaspect = { - .name = "pixelaspect", - .description = NULL_IF_CONFIG_SMALL("Set the pixel aspect ratio."), +#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; + + return 0; +} + +AVFilter avfilter_vf_setsar = { + .name = "setsar", + .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."), .init = init, @@ -110,6 +132,7 @@ AVFilter avfilter_vf_pixelaspect = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, + .config_props = setsar_config_props, .get_video_buffer = avfilter_null_get_video_buffer, .start_frame = start_frame, .end_frame = avfilter_null_end_frame }, @@ -119,5 +142,4 @@ AVFilter avfilter_vf_pixelaspect = { .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; -#endif /* CONFIG_PIXELASPECT_FILTER */ - +#endif /* CONFIG_SETSAR_FILTER */