RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/vf_lut2: move to "activate" design.

This commit is contained in:
Nicolas George 2017-07-17 16:45:17 +02:00
parent 27d8af03ae
commit dbc4af862e
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/Makefile
View File

@ -221,7 +221,7 @@ OBJS-$(CONFIG_LIMITER_FILTER) += vf_limiter.o
OBJS-$(CONFIG_LOOP_FILTER) += f_loop.o OBJS-$(CONFIG_LOOP_FILTER) += f_loop.o
OBJS-$(CONFIG_LUMAKEY_FILTER) += vf_lumakey.o OBJS-$(CONFIG_LUMAKEY_FILTER) += vf_lumakey.o
OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUT2_FILTER) += vf_lut2.o framesync.o OBJS-$(CONFIG_LUT2_FILTER) += vf_lut2.o framesync2.o
OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o 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

26
libavfilter/vf_lut2.c
View File

@ -28,7 +28,7 @@
#include "formats.h" #include "formats.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
#include "framesync.h" #include "framesync2.h"
static const char *const var_names[] = { static const char *const var_names[] = {
"w", ///< width of the input video "w", ///< width of the input video
@ -206,8 +206,8 @@ static int process_frame(FFFrameSync *fs)
AVFrame *out, *srcx, *srcy; AVFrame *out, *srcx, *srcy;
int ret; int ret;
if ((ret = ff_framesync_get_frame(&s->fs, 0, &srcx, 0)) < 0 || if ((ret = ff_framesync2_get_frame(&s->fs, 0, &srcx, 0)) < 0 ||
(ret = ff_framesync_get_frame(&s->fs, 1, &srcy, 0)) < 0) (ret = ff_framesync2_get_frame(&s->fs, 1, &srcy, 0)) < 0)
return ret; return ret;
if (ctx->is_disabled) { if (ctx->is_disabled) {
@ -266,7 +266,7 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = srcx->sample_aspect_ratio; outlink->sample_aspect_ratio = srcx->sample_aspect_ratio;
outlink->frame_rate = srcx->frame_rate; outlink->frame_rate = srcx->frame_rate;
if ((ret = ff_framesync_init(&s->fs, ctx, 2)) < 0) if ((ret = ff_framesync2_init(&s->fs, ctx, 2)) < 0)
return ret; return ret;
in = s->fs.in; in = s->fs.in;
@ -323,32 +323,24 @@ static int config_output(AVFilterLink *outlink)
} }
} }
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)
{ {
LUT2Context *s = inlink->dst->priv; LUT2Context *s = ctx->priv;
return ff_framesync_filter_frame(&s->fs, inlink, buf); return ff_framesync2_activate(&s->fs);
}
static int request_frame(AVFilterLink *outlink)
{
LUT2Context *s = outlink->src->priv;
return ff_framesync_request_frame(&s->fs, outlink);
} }
static const AVFilterPad inputs[] = { static const AVFilterPad inputs[] = {
{ {
.name = "srcx", .name = "srcx",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_inputx, .config_props = config_inputx,
}, },
{ {
.name = "srcy", .name = "srcy",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
.config_props = config_inputy, .config_props = config_inputy,
}, },
{ NULL } { NULL }
@ -359,7 +351,6 @@ static const AVFilterPad 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 }
}; };
@ -373,6 +364,7 @@ AVFilter ff_vf_lut2 = {
.priv_class = &lut2_class, .priv_class = &lut2_class,
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.activate = activate,
.inputs = inputs, .inputs = inputs,
.outputs = outputs, .outputs = outputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,