virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavfi/vf_maskedmerge: move to "activate" design.

Browse Source
This commit is contained in:
Nicolas George
2017-07-17 16:38:18 +02:00
parent 620608467f
commit a5e3b0c193
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/Makefile
View File

@@ -226,7 +226,7 @@ OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o
OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o
OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync.o OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync2.o
OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o
OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o

2
libavfilter/maskedmerge.h
View File

@@ -22,7 +22,7 @@
#define AVFILTER_MASKEDMERGE_H #define AVFILTER_MASKEDMERGE_H
#include "avfilter.h" #include "avfilter.h"
#include "framesync.h" #include "framesync2.h"
typedef struct MaskedMergeContext { typedef struct MaskedMergeContext {
const AVClass *class; const AVClass *class;

29
libavfilter/vf_maskedmerge.c
View File

@@ -71,9 +71,9 @@ static int process_frame(FFFrameSync *fs)
AVFrame *out, *base, *overlay, *mask; AVFrame *out, *base, *overlay, *mask;
int ret; int ret;
if ((ret = ff_framesync_get_frame(&s->fs, 0, &base, 0)) < 0 || if ((ret = ff_framesync2_get_frame(&s->fs, 0, &base, 0)) < 0 ||
(ret = ff_framesync_get_frame(&s->fs, 1, &overlay, 0)) < 0 || (ret = ff_framesync2_get_frame(&s->fs, 1, &overlay, 0)) < 0 ||
(ret = ff_framesync_get_frame(&s->fs, 2, &mask, 0)) < 0) (ret = ff_framesync2_get_frame(&s->fs, 2, &mask, 0)) < 0)
return ret; return ret;
if (ctx->is_disabled) { if (ctx->is_disabled) {
@@ -232,7 +232,7 @@ static int config_output(AVFilterLink *outlink)
if ((ret = av_image_fill_linesizes(s->linesize, outlink->format, outlink->w)) < 0) if ((ret = av_image_fill_linesizes(s->linesize, outlink->format, outlink->w)) < 0)
return ret; return ret;
if ((ret = ff_framesync_init(&s->fs, ctx, 3)) < 0) if ((ret = ff_framesync2_init(&s->fs, ctx, 3)) < 0)
return ret; return ret;
in = s->fs.in; in = s->fs.in;
@@ -251,44 +251,35 @@ static int config_output(AVFilterLink *outlink)
s->fs.opaque = s; s->fs.opaque = s;
s->fs.on_event = process_frame; s->fs.on_event = process_frame;
return ff_framesync_configure(&s->fs); return ff_framesync2_configure(&s->fs);
} }
static int filter_frame(AVFilterLink *inlink, AVFrame *buf) static int activate(AVFilterContext *ctx)
{ {
MaskedMergeContext *s = inlink->dst->priv; MaskedMergeContext *s = ctx->priv;
return ff_framesync_filter_frame(&s->fs, inlink, buf); return ff_framesync2_activate(&s->fs);
}
static int request_frame(AVFilterLink *outlink)
{
MaskedMergeContext *s = outlink->src->priv;
return ff_framesync_request_frame(&s->fs, outlink);
} }
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
MaskedMergeContext *s = ctx->priv; MaskedMergeContext *s = ctx->priv;
ff_framesync_uninit(&s->fs); ff_framesync2_uninit(&s->fs);
} }
static const AVFilterPad maskedmerge_inputs[] = { static const AVFilterPad maskedmerge_inputs[] = {
{ {
.name = "base", .name = "base",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_input, .config_props = config_input,
}, },
{ {
.name = "overlay", .name = "overlay",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
}, },
{ {
.name = "mask", .name = "mask",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
@@ -298,7 +289,6 @@ static const AVFilterPad maskedmerge_outputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output, .config_props = config_output,
.request_frame = request_frame,
}, },
{ NULL } { NULL }
}; };
@@ -309,6 +299,7 @@ AVFilter ff_vf_maskedmerge = {
.priv_size = sizeof(MaskedMergeContext), .priv_size = sizeof(MaskedMergeContext),
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.activate = activate,
.inputs = maskedmerge_inputs, .inputs = maskedmerge_inputs,
.outputs = maskedmerge_outputs, .outputs = maskedmerge_outputs,
.priv_class = &maskedmerge_class, .priv_class = &maskedmerge_class,