/*
* 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
*/
* aspect ratio modification video filters
*/
+#include "libavutil/common.h"
+#include "libavutil/mathematics.h"
#include "avfilter.h"
+#include "internal.h"
+#include "video.h"
typedef struct {
AVRational aspect;
} AspectContext;
-static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+static av_cold int init(AVFilterContext *ctx, const char *args)
{
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_VERBOSE, "a:%d/%d\n", aspect->aspect.num, aspect->aspect.den);
return 0;
}
-static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
+static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AspectContext *aspect = link->dst->priv;
picref->video->pixel_aspect = aspect->aspect;
- avfilter_start_frame(link->dst->outputs[0], picref);
+ link->cur_buf = NULL;
+ return ff_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_VERBOSE, "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."),
+static const AVFilterPad avfilter_vf_setdar_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = setdar_config_props,
+ .get_video_buffer = ff_null_get_video_buffer,
+ .start_frame = start_frame,
+ .end_frame = ff_null_end_frame
+ },
+ { NULL }
+};
+
+static const AVFilterPad avfilter_vf_setdar_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ },
+ { NULL }
+};
+
+AVFilter avfilter_vf_setdar = {
+ .name = "setdar",
+ .description = NULL_IF_CONFIG_SMALL("Set the frame display aspect ratio."),
.init = init,
.priv_size = sizeof(AspectContext),
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .config_props = frameaspect_config_props,
- .get_video_buffer = avfilter_null_get_video_buffer,
- .start_frame = start_frame,
- .end_frame = avfilter_null_end_frame },
- { .name = NULL}},
-
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO, },
- { .name = NULL}},
+ .inputs = avfilter_vf_setdar_inputs,
+
+ .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;
+
+ inlink->sample_aspect_ratio = aspect->aspect;
+
+ return 0;
+}
+
+static const AVFilterPad avfilter_vf_setsar_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = setsar_config_props,
+ .get_video_buffer = ff_null_get_video_buffer,
+ .start_frame = start_frame,
+ .end_frame = ff_null_end_frame
+ },
+ { NULL }
};
-#endif /* CONFIG_ASPECT_FILTER */
-#if CONFIG_PIXELASPECT_FILTER
-AVFilter avfilter_vf_pixelaspect = {
- .name = "pixelaspect",
- .description = NULL_IF_CONFIG_SMALL("Set the pixel aspect ratio."),
+static const AVFilterPad avfilter_vf_setsar_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ },
+ { NULL }
+};
+
+AVFilter avfilter_vf_setsar = {
+ .name = "setsar",
+ .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."),
.init = init,
.priv_size = sizeof(AspectContext),
- .inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO,
- .get_video_buffer = avfilter_null_get_video_buffer,
- .start_frame = start_frame,
- .end_frame = avfilter_null_end_frame },
- { .name = NULL}},
+ .inputs = avfilter_vf_setsar_inputs,
- .outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AVMEDIA_TYPE_VIDEO, },
- { .name = NULL}},
+ .outputs = avfilter_vf_setsar_outputs,
};
-#endif /* CONFIG_PIXELASPECT_FILTER */
-
+#endif /* CONFIG_SETSAR_FILTER */
projects / ffmpeg / blobdiff