highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/vf_hysteresis: move to "activate" design.

Browse Source
This commit is contained in:
Nicolas George
2017-07-17 16:54:23 +02:00
parent dbc4af862e
commit 5dbb111900
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/Makefile
View File

@@ -208,7 +208,7 @@ OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o
OBJS-$(CONFIG_HWMAP_FILTER) += vf_hwmap.o OBJS-$(CONFIG_HWMAP_FILTER) += vf_hwmap.o
OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o
OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
OBJS-$(CONFIG_HYSTERESIS_FILTER) += vf_hysteresis.o framesync.o OBJS-$(CONFIG_HYSTERESIS_FILTER) += vf_hysteresis.o framesync2.o
OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
OBJS-$(CONFIG_IL_FILTER) += vf_il.o OBJS-$(CONFIG_IL_FILTER) += vf_il.o
OBJS-$(CONFIG_INFLATE_FILTER) += vf_neighbor.o OBJS-$(CONFIG_INFLATE_FILTER) += vf_neighbor.o

28
libavfilter/vf_hysteresis.c
View File

@@ -26,7 +26,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"
#define OFFSET(x) offsetof(HysteresisContext, x) #define OFFSET(x) offsetof(HysteresisContext, x)
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
@@ -94,8 +94,8 @@ static int process_frame(FFFrameSync *fs)
AVFrame *out, *base, *alt; AVFrame *out, *base, *alt;
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, &alt, 0)) < 0) (ret = ff_framesync2_get_frame(&s->fs, 1, &alt, 0)) < 0)
return ret; return ret;
if (ctx->is_disabled) { if (ctx->is_disabled) {
@@ -324,7 +324,7 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = base->sample_aspect_ratio; outlink->sample_aspect_ratio = base->sample_aspect_ratio;
outlink->frame_rate = base->frame_rate; outlink->frame_rate = base->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;
@@ -339,26 +339,20 @@ 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)
{ {
HysteresisContext *s = inlink->dst->priv; HysteresisContext *s = ctx->priv;
return ff_framesync_filter_frame(&s->fs, inlink, buf); return ff_framesync2_activate(&s->fs);
}
static int request_frame(AVFilterLink *outlink)
{
HysteresisContext *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)
{ {
HysteresisContext *s = ctx->priv; HysteresisContext *s = ctx->priv;
ff_framesync_uninit(&s->fs); ff_framesync2_uninit(&s->fs);
av_freep(&s->map); av_freep(&s->map);
av_freep(&s->xy); av_freep(&s->xy);
} }
@@ -367,13 +361,11 @@ static const AVFilterPad hysteresis_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 = "alt", .name = "alt",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
@@ -383,7 +375,6 @@ static const AVFilterPad hysteresis_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 }
}; };
@@ -394,6 +385,7 @@ AVFilter ff_vf_hysteresis = {
.priv_size = sizeof(HysteresisContext), .priv_size = sizeof(HysteresisContext),
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.activate = activate,
.inputs = hysteresis_inputs, .inputs = hysteresis_inputs,
.outputs = hysteresis_outputs, .outputs = hysteresis_outputs,
.priv_class = &hysteresis_class, .priv_class = &hysteresis_class,