mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-21 05:46:55 +00:00
c581cb4e4f
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
135 lines
4.5 KiB
C
135 lines
4.5 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;
|
|
}
|
|
|
|
AVFilter avfilter_vf_setdar = {
|
|
.name = "setdar",
|
|
.description = NULL_IF_CONFIG_SMALL("Set the frame display aspect ratio."),
|
|
|
|
.init = init,
|
|
|
|
.priv_size = sizeof(AspectContext),
|
|
|
|
.inputs = (const AVFilterPad[]) {{ .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 },
|
|
{ .name = NULL}},
|
|
|
|
.outputs = (const AVFilterPad[]) {{ .name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO, },
|
|
{ .name = NULL}},
|
|
};
|
|
#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;
|
|
}
|
|
|
|
AVFilter avfilter_vf_setsar = {
|
|
.name = "setsar",
|
|
.description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."),
|
|
|
|
.init = init,
|
|
|
|
.priv_size = sizeof(AspectContext),
|
|
|
|
.inputs = (const AVFilterPad[]) {{ .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 },
|
|
{ .name = NULL}},
|
|
|
|
.outputs = (const AVFilterPad[]) {{ .name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO, },
|
|
{ .name = NULL}},
|
|
};
|
|
#endif /* CONFIG_SETSAR_FILTER */
|