mirror of https://git.ffmpeg.org/ffmpeg.git
lavfi/f_streamselect: convert to framesync2.
This commit is contained in:
Nicolas George
parent
95a6de5674
commit
6bde475cf2
|
|
@ -67,7 +67,7 @@ OBJS-$(CONFIG_ASHOWINFO_FILTER) += af_ashowinfo.o
|
|||
OBJS-$(CONFIG_ASIDEDATA_FILTER) += f_sidedata.o
|
||||
OBJS-$(CONFIG_ASPLIT_FILTER) += split.o
|
||||
OBJS-$(CONFIG_ASTATS_FILTER) += af_astats.o
|
||||
OBJS-$(CONFIG_ASTREAMSELECT_FILTER) += f_streamselect.o
|
||||
OBJS-$(CONFIG_ASTREAMSELECT_FILTER) += f_streamselect.o framesync2.o
|
||||
OBJS-$(CONFIG_ATEMPO_FILTER) += af_atempo.o
|
||||
OBJS-$(CONFIG_ATRIM_FILTER) += trim.o
|
||||
OBJS-$(CONFIG_AZMQ_FILTER) += f_zmq.o
|
||||
|
|
@ -303,7 +303,7 @@ OBJS-$(CONFIG_SPLIT_FILTER) += split.o
|
|||
OBJS-$(CONFIG_SPP_FILTER) += vf_spp.o
|
||||
OBJS-$(CONFIG_SSIM_FILTER) += vf_ssim.o dualinput.o framesync.o
|
||||
OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o
|
||||
OBJS-$(CONFIG_STREAMSELECT_FILTER) += f_streamselect.o
|
||||
OBJS-$(CONFIG_STREAMSELECT_FILTER) += f_streamselect.o framesync2.o
|
||||
OBJS-$(CONFIG_SUBTITLES_FILTER) += vf_subtitles.o
|
||||
OBJS-$(CONFIG_SUPER2XSAI_FILTER) += vf_super2xsai.o
|
||||
OBJS-$(CONFIG_SWAPRECT_FILTER) += vf_swaprect.o
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "avfilter.h"
|
||||
#include "audio.h"
|
||||
#include "formats.h"
|
||||
#include "framesync.h"
|
||||
#include "framesync2.h"
|
||||
#include "internal.h"
|
||||
#include "video.h"
|
||||
|
||||
|
|
@ -48,12 +48,6 @@ static const AVOption streamselect_options[] = {
|
|||
|
||||
AVFILTER_DEFINE_CLASS(streamselect);
|
||||
|
||||
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
|
||||
{
|
||||
StreamSelectContext *s = inlink->dst->priv;
|
||||
return ff_framesync_filter_frame(&s->fs, inlink, in);
|
||||
}
|
||||
|
||||
static int process_frame(FFFrameSync *fs)
|
||||
{
|
||||
AVFilterContext *ctx = fs->parent;
|
||||
|
|
@ -62,7 +56,7 @@ static int process_frame(FFFrameSync *fs)
|
|||
int i, j, ret = 0;
|
||||
|
||||
for (i = 0; i < ctx->nb_inputs; i++) {
|
||||
if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0)
|
||||
if ((ret = ff_framesync2_get_frame(&s->fs, i, &in[i], 0)) < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -90,10 +84,10 @@ static int process_frame(FFFrameSync *fs)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int request_frame(AVFilterLink *outlink)
|
||||
static int activate(AVFilterContext *ctx)
|
||||
{
|
||||
StreamSelectContext *s = outlink->src->priv;
|
||||
return ff_framesync_request_frame(&s->fs, outlink);
|
||||
StreamSelectContext *s = ctx->priv;
|
||||
return ff_framesync2_activate(&s->fs);
|
||||
}
|
||||
|
||||
static int config_output(AVFilterLink *outlink)
|
||||
|
|
@ -130,7 +124,7 @@ static int config_output(AVFilterLink *outlink)
|
|||
if (s->fs.opaque == s)
|
||||
return 0;
|
||||
|
||||
if ((ret = ff_framesync_init(&s->fs, ctx, ctx->nb_inputs)) < 0)
|
||||
if ((ret = ff_framesync2_init(&s->fs, ctx, ctx->nb_inputs)) < 0)
|
||||
return ret;
|
||||
|
||||
in = s->fs.in;
|
||||
|
|
@ -148,12 +142,11 @@ static int config_output(AVFilterLink *outlink)
|
|||
if (!s->frames)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
return ff_framesync_configure(&s->fs);
|
||||
return ff_framesync2_configure(&s->fs);
|
||||
}
|
||||
|
||||
static int parse_definition(AVFilterContext *ctx, int nb_pads, void *filter_frame, int is_audio)
|
||||
static int parse_definition(AVFilterContext *ctx, int nb_pads, int is_input, int is_audio)
|
||||
{
|
||||
const int is_input = !!filter_frame;
|
||||
const char *padtype = is_input ? "in" : "out";
|
||||
int i = 0, ret = 0;
|
||||
|
||||
|
|
@ -169,11 +162,9 @@ static int parse_definition(AVFilterContext *ctx, int nb_pads, void *filter_fram
|
|||
av_log(ctx, AV_LOG_DEBUG, "Add %s pad %s\n", padtype, pad.name);
|
||||
|
||||
if (is_input) {
|
||||
pad.filter_frame = filter_frame;
|
||||
ret = ff_insert_inpad(ctx, i, &pad);
|
||||
} else {
|
||||
pad.config_props = config_output;
|
||||
pad.request_frame = request_frame;
|
||||
ret = ff_insert_outpad(ctx, i, &pad);
|
||||
}
|
||||
|
||||
|
|
@ -281,8 +272,8 @@ static av_cold int init(AVFilterContext *ctx)
|
|||
if (!s->last_pts)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
if ((ret = parse_definition(ctx, s->nb_inputs, filter_frame, s->is_audio)) < 0 ||
|
||||
(ret = parse_definition(ctx, nb_outputs, NULL, s->is_audio)) < 0)
|
||||
if ((ret = parse_definition(ctx, s->nb_inputs, 1, s->is_audio)) < 0 ||
|
||||
(ret = parse_definition(ctx, nb_outputs, 0, s->is_audio)) < 0)
|
||||
return ret;
|
||||
|
||||
av_log(ctx, AV_LOG_DEBUG, "Configured with %d inpad and %d outpad\n",
|
||||
|
|
@ -298,7 +289,7 @@ static av_cold void uninit(AVFilterContext *ctx)
|
|||
av_freep(&s->last_pts);
|
||||
av_freep(&s->map);
|
||||
av_freep(&s->frames);
|
||||
ff_framesync_uninit(&s->fs);
|
||||
ff_framesync2_uninit(&s->fs);
|
||||
}
|
||||
|
||||
static int query_formats(AVFilterContext *ctx)
|
||||
|
|
@ -332,6 +323,7 @@ AVFilter ff_vf_streamselect = {
|
|||
.query_formats = query_formats,
|
||||
.process_command = process_command,
|
||||
.uninit = uninit,
|
||||
.activate = activate,
|
||||
.priv_size = sizeof(StreamSelectContext),
|
||||
.priv_class = &streamselect_class,
|
||||
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,
|
||||
|
|
@ -347,6 +339,7 @@ AVFilter ff_af_astreamselect = {
|
|||
.query_formats = query_formats,
|
||||
.process_command = process_command,
|
||||
.uninit = uninit,
|
||||
.activate = activate,
|
||||
.priv_size = sizeof(StreamSelectContext),
|
||||
.priv_class = &astreamselect_class,
|
||||
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,
|
||||
|
|
|
|||
Loading…
Reference in New Issue