mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
c7b9eab2be
* qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
133 lines
4.4 KiB
C
133 lines
4.4 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/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, void *opaque)
|
|
{
|
|
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_INFO, "a:%d/%d\n", aspect->ratio.num, aspect->ratio.den);
|
|
return 0;
|
|
}
|
|
|
|
static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
|
|
{
|
|
AspectContext *aspect = link->dst->priv;
|
|
|
|
picref->video->sample_aspect_ratio = aspect->ratio;
|
|
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_INFO, "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 */
|