526cb36e4b
* commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
159 lines
4.2 KiB
C
159 lines
4.2 KiB
C
/*
|
|
* Copyright (c) 2010 Bobby Bingham
|
|
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* aspect ratio modification video filters
|
|
*/
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/mathematics.h"
|
|
#include "libavutil/parseutils.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
#include "video.h"
|
|
|
|
typedef struct {
|
|
AVRational ratio;
|
|
} AspectContext;
|
|
|
|
static av_cold int init(AVFilterContext *ctx, const char *args)
|
|
{
|
|
AspectContext *aspect = ctx->priv;
|
|
aspect->ratio = (AVRational) {0, 1};
|
|
|
|
if (args) {
|
|
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);
|
|
}
|
|
}
|
|
|
|
av_log(ctx, AV_LOG_VERBOSE, "a:%d/%d\n", aspect->ratio.num, aspect->ratio.den);
|
|
return 0;
|
|
}
|
|
|
|
static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
|
|
{
|
|
AspectContext *aspect = link->dst->priv;
|
|
|
|
picref->video->sample_aspect_ratio = aspect->ratio;
|
|
link->cur_buf = NULL;
|
|
return ff_start_frame(link->dst->outputs[0], picref);
|
|
}
|
|
|
|
#if CONFIG_SETDAR_FILTER
|
|
static int setdar_config_props(AVFilterLink *inlink)
|
|
{
|
|
AspectContext *aspect = inlink->dst->priv;
|
|
AVRational dar = aspect->ratio;
|
|
|
|
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_VERBOSE, "w:%d h:%d -> dar:%d/%d sar:%d/%d\n",
|
|
inlink->w, inlink->h, dar.num, dar.den, aspect->ratio.num, aspect->ratio.den);
|
|
|
|
inlink->sample_aspect_ratio = aspect->ratio;
|
|
|
|
return 0;
|
|
}
|
|
|
|
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 = avfilter_vf_setdar_inputs,
|
|
|
|
.outputs = avfilter_vf_setdar_outputs,
|
|
};
|
|
#endif /* CONFIG_SETDAR_FILTER */
|
|
|
|
#if CONFIG_SETSAR_FILTER
|
|
static int setsar_config_props(AVFilterLink *inlink)
|
|
{
|
|
AspectContext *aspect = inlink->dst->priv;
|
|
|
|
inlink->sample_aspect_ratio = aspect->ratio;
|
|
|
|
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 }
|
|
};
|
|
|
|
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 = avfilter_vf_setsar_inputs,
|
|
|
|
.outputs = avfilter_vf_setsar_outputs,
|
|
};
|
|
#endif /* CONFIG_SETSAR_FILTER */
|