mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 20:50:09 +00:00
a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.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_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
184 lines
5.1 KiB
C
184 lines
5.1 KiB
C
/*
|
|
* Copyright (c) 2010 Stefano Sabatini
|
|
*
|
|
* 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
|
|
* Set timebase for the output link.
|
|
*/
|
|
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
|
|
#include "libavutil/avstring.h"
|
|
#include "libavutil/eval.h"
|
|
#include "libavutil/internal.h"
|
|
#include "libavutil/mathematics.h"
|
|
#include "libavutil/rational.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
#include "audio.h"
|
|
#include "video.h"
|
|
|
|
static const char *const var_names[] = {
|
|
"AVTB", /* default timebase 1/AV_TIME_BASE */
|
|
"intb", /* input timebase */
|
|
"sr", /* sample rate */
|
|
NULL
|
|
};
|
|
|
|
enum var_name {
|
|
VAR_AVTB,
|
|
VAR_INTB,
|
|
VAR_SR,
|
|
VAR_VARS_NB
|
|
};
|
|
|
|
typedef struct {
|
|
char tb_expr[256];
|
|
double var_values[VAR_VARS_NB];
|
|
} SetTBContext;
|
|
|
|
static av_cold int init(AVFilterContext *ctx, const char *args)
|
|
{
|
|
SetTBContext *settb = ctx->priv;
|
|
av_strlcpy(settb->tb_expr, "intb", sizeof(settb->tb_expr));
|
|
|
|
if (args)
|
|
sscanf(args, "%255[^:]", settb->tb_expr);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int config_output_props(AVFilterLink *outlink)
|
|
{
|
|
AVFilterContext *ctx = outlink->src;
|
|
SetTBContext *settb = ctx->priv;
|
|
AVFilterLink *inlink = ctx->inputs[0];
|
|
AVRational time_base;
|
|
int ret;
|
|
double res;
|
|
|
|
settb->var_values[VAR_AVTB] = av_q2d(AV_TIME_BASE_Q);
|
|
settb->var_values[VAR_INTB] = av_q2d(inlink->time_base);
|
|
settb->var_values[VAR_SR] = inlink->sample_rate;
|
|
|
|
outlink->w = inlink->w;
|
|
outlink->h = inlink->h;
|
|
|
|
if ((ret = av_expr_parse_and_eval(&res, settb->tb_expr, var_names, settb->var_values,
|
|
NULL, NULL, NULL, NULL, NULL, 0, NULL)) < 0) {
|
|
av_log(ctx, AV_LOG_ERROR, "Invalid expression '%s' for timebase.\n", settb->tb_expr);
|
|
return ret;
|
|
}
|
|
time_base = av_d2q(res, INT_MAX);
|
|
if (time_base.num <= 0 || time_base.den <= 0) {
|
|
av_log(ctx, AV_LOG_ERROR,
|
|
"Invalid non-positive values for the timebase num:%d or den:%d.\n",
|
|
time_base.num, time_base.den);
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
outlink->time_base = time_base;
|
|
av_log(outlink->src, AV_LOG_VERBOSE, "tb:%d/%d -> tb:%d/%d\n",
|
|
inlink ->time_base.num, inlink ->time_base.den,
|
|
outlink->time_base.num, outlink->time_base.den);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
AVFilterLink *outlink = ctx->outputs[0];
|
|
|
|
if (av_cmp_q(inlink->time_base, outlink->time_base)) {
|
|
int64_t orig_pts = frame->pts;
|
|
frame->pts = av_rescale_q(frame->pts, inlink->time_base, outlink->time_base);
|
|
av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
|
|
inlink ->time_base.num, inlink ->time_base.den, orig_pts,
|
|
outlink->time_base.num, outlink->time_base.den, frame->pts);
|
|
}
|
|
|
|
return ff_filter_frame(outlink, frame);
|
|
}
|
|
|
|
#if CONFIG_SETTB_FILTER
|
|
static const AVFilterPad avfilter_vf_settb_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.get_video_buffer = ff_null_get_video_buffer,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
static const AVFilterPad avfilter_vf_settb_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.config_props = config_output_props,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_vf_settb = {
|
|
.name = "settb",
|
|
.description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."),
|
|
.init = init,
|
|
|
|
.priv_size = sizeof(SetTBContext),
|
|
|
|
.inputs = avfilter_vf_settb_inputs,
|
|
.outputs = avfilter_vf_settb_outputs,
|
|
};
|
|
#endif
|
|
|
|
#if CONFIG_ASETTB_FILTER
|
|
static const AVFilterPad avfilter_af_asettb_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.get_audio_buffer = ff_null_get_audio_buffer,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
static const AVFilterPad avfilter_af_asettb_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.config_props = config_output_props,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_af_asettb = {
|
|
.name = "asettb",
|
|
.description = NULL_IF_CONFIG_SMALL("Set timebase for the audio output link."),
|
|
.init = init,
|
|
|
|
.priv_size = sizeof(SetTBContext),
|
|
.inputs = avfilter_af_asettb_inputs,
|
|
.outputs = avfilter_af_asettb_outputs,
|
|
};
|
|
#endif
|