[FFmpeg-cvslog] avfilter: add tmedian filter
Paul B Mahol
git at videolan.org
Sat Apr 18 15:09:40 EEST 2020
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Apr 13 16:12:50 2020 +0200| [9987f6d01e6d50eba378b64b890a6f5885e27989] | committer: Paul B Mahol
avfilter: add tmedian filter
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9987f6d01e6d50eba378b64b890a6f5885e27989
---
Changelog | 1 +
doc/filters.texi | 19 +++++++++
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/version.h | 4 +-
libavfilter/vf_xmedian.c | 108 ++++++++++++++++++++++++++++++++++++++++++++---
6 files changed, 127 insertions(+), 7 deletions(-)
diff --git a/Changelog b/Changelog
index d9fcd8bb0a..30d3a816bd 100644
--- a/Changelog
+++ b/Changelog
@@ -59,6 +59,7 @@ version <next>:
- mv30 decoder
- Expanded styling support for 3GPP Timed Text Subtitles (movtext)
- WebP parser
+- tmedian filter
version 4.2:
diff --git a/doc/filters.texi b/doc/filters.texi
index a17f3cb837..cc09fee5dd 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -18382,6 +18382,25 @@ enabled for @option{mode} @var{interleave_top} and @var{interleave_bottom}.
@end table
+ at section tmedian
+Pick median pixels from several successive input video frames.
+
+The filter accepts the following options:
+
+ at table @option
+ at item radius
+Set radius of median filter.
+Default is 1. Allowed range is from 1 to 127.
+
+ at item planes
+Set which planes to filter. Default value is @code{15}, by which all planes are processed.
+
+ at item percentile
+Set median percentile. Default value is @code{0.5}.
+Default value of @code{0.5} will pick always median values, while @code{0} will pick
+minimum values, and @code{1} maximum values.
+ at end table
+
@section tmix
Mix successive video frames.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index ecbc628868..b54e6cd374 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -417,6 +417,7 @@ OBJS-$(CONFIG_THUMBNAIL_CUDA_FILTER) += vf_thumbnail_cuda.o vf_thumbnail
OBJS-$(CONFIG_TILE_FILTER) += vf_tile.o
OBJS-$(CONFIG_TINTERLACE_FILTER) += vf_tinterlace.o
OBJS-$(CONFIG_TLUT2_FILTER) += vf_lut2.o framesync.o
+OBJS-$(CONFIG_TMEDIAN_FILTER) += vf_xmedian.o framesync.o
OBJS-$(CONFIG_TMIX_FILTER) += vf_mix.o framesync.o
OBJS-$(CONFIG_TONEMAP_FILTER) += vf_tonemap.o colorspace.o
OBJS-$(CONFIG_TONEMAP_OPENCL_FILTER) += vf_tonemap_opencl.o colorspace.o opencl.o \
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index fb32bef788..5842196118 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -398,6 +398,7 @@ extern AVFilter ff_vf_thumbnail_cuda;
extern AVFilter ff_vf_tile;
extern AVFilter ff_vf_tinterlace;
extern AVFilter ff_vf_tlut2;
+extern AVFilter ff_vf_tmedian;
extern AVFilter ff_vf_tmix;
extern AVFilter ff_vf_tonemap;
extern AVFilter ff_vf_tonemap_opencl;
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 3618d35905..4c4e8afe2d 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,8 +30,8 @@
#include "libavutil/version.h"
#define LIBAVFILTER_VERSION_MAJOR 7
-#define LIBAVFILTER_VERSION_MINOR 77
-#define LIBAVFILTER_VERSION_MICRO 101
+#define LIBAVFILTER_VERSION_MINOR 78
+#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c
index 52c5b060fa..15857d6f14 100644
--- a/libavfilter/vf_xmedian.c
+++ b/libavfilter/vf_xmedian.c
@@ -35,9 +35,11 @@ typedef struct XMedianContext {
const AVClass *class;
const AVPixFmtDescriptor *desc;
int nb_inputs;
+ int nb_frames;
int planes;
float percentile;
+ int tmedian;
int radius;
int index;
int depth;
@@ -95,7 +97,14 @@ static av_cold int init(AVFilterContext *ctx)
XMedianContext *s = ctx->priv;
int ret;
- s->radius = s->nb_inputs / 2;
+ s->tmedian = !strcmp(ctx->filter->name, "tmedian");
+
+ if (!s->tmedian) {
+ s->radius = s->nb_inputs / 2;
+ } else {
+ s->nb_inputs = s->radius * 2 + 1;
+ }
+
if (s->nb_inputs & 1)
s->index = s->radius * 2.f * s->percentile;
else
@@ -104,7 +113,7 @@ static av_cold int init(AVFilterContext *ctx)
if (!s->frames)
return AVERROR(ENOMEM);
- for (int i = 0; i < s->nb_inputs; i++) {
+ for (int i = 0; i < s->nb_inputs && !s->tmedian; i++) {
AVFilterPad pad = { 0 };
pad.type = AVMEDIA_TYPE_VIDEO;
@@ -259,7 +268,7 @@ static int config_output(AVFilterLink *outlink)
FFFrameSyncIn *in;
int i, ret;
- for (int i = 1; i < s->nb_inputs; i++) {
+ for (int i = 1; i < s->nb_inputs && !s->tmedian; i++) {
if (ctx->inputs[i]->h != height || ctx->inputs[i]->w != width) {
av_log(ctx, AV_LOG_ERROR, "Input %d size (%dx%d) does not match input %d size (%dx%d).\n", i, ctx->inputs[i]->w, ctx->inputs[i]->h, 0, width, height);
return AVERROR(EINVAL);
@@ -286,6 +295,9 @@ static int config_output(AVFilterLink *outlink)
s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h);
s->height[0] = s->height[3] = inlink->h;
+ if (s->tmedian)
+ return 0;
+
outlink->w = width;
outlink->h = height;
outlink->frame_rate = frame_rate;
@@ -318,10 +330,12 @@ static av_cold void uninit(AVFilterContext *ctx)
XMedianContext *s = ctx->priv;
ff_framesync_uninit(&s->fs);
- av_freep(&s->frames);
- for (int i = 0; i < ctx->nb_inputs; i++)
+ for (int i = 0; i < ctx->nb_inputs && !s->tmedian; i++)
av_freep(&ctx->input_pads[i].name);
+ for (int i = 0; i < s->nb_frames && s->frames && s->tmedian; i++)
+ av_frame_free(&s->frames[i]);
+ av_freep(&s->frames);
}
static int activate(AVFilterContext *ctx)
@@ -349,6 +363,7 @@ static const AVFilterPad outputs[] = {
{ NULL }
};
+#if CONFIG_XMEDIAN_FILTER
AVFILTER_DEFINE_CLASS(xmedian);
AVFilter ff_vf_xmedian = {
@@ -363,3 +378,86 @@ AVFilter ff_vf_xmedian = {
.activate = activate,
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS,
};
+
+#endif /* CONFIG_XMEDIAN_FILTER */
+
+#if CONFIG_TMEDIAN_FILTER
+static int tmedian_filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+ AVFilterContext *ctx = inlink->dst;
+ AVFilterLink *outlink = ctx->outputs[0];
+ XMedianContext *s = ctx->priv;
+ ThreadData td;
+ AVFrame *out;
+
+ if (s->nb_frames < s->nb_inputs) {
+ s->frames[s->nb_frames] = in;
+ s->nb_frames++;
+ if (s->nb_frames < s->nb_inputs)
+ return 0;
+ } else {
+ av_frame_free(&s->frames[0]);
+ memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1));
+ s->frames[s->nb_inputs - 1] = in;
+ }
+
+ if (ctx->is_disabled) {
+ out = av_frame_clone(s->frames[0]);
+ if (!out)
+ return AVERROR(ENOMEM);
+ return ff_filter_frame(outlink, out);
+ }
+
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+ if (!out)
+ return AVERROR(ENOMEM);
+ out->pts = s->frames[0]->pts;
+
+ td.out = out;
+ td.in = s->frames;
+ ctx->internal->execute(ctx, s->median_frames, &td, NULL, FFMIN(s->height[0], ff_filter_get_nb_threads(ctx)));
+
+ return ff_filter_frame(outlink, out);
+}
+
+static const AVOption tmedian_options[] = {
+ { "radius", "set median filter radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, .flags = FLAGS },
+ { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=15}, 0, 15, .flags = FLAGS },
+ { "percentile", "set percentile", OFFSET(percentile), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, .flags = FLAGS },
+ { NULL },
+};
+
+static const AVFilterPad tmedian_inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = tmedian_filter_frame,
+ },
+ { NULL }
+};
+
+static const AVFilterPad tmedian_outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_output,
+ },
+ { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(tmedian);
+
+AVFilter ff_vf_tmedian = {
+ .name = "tmedian",
+ .description = NULL_IF_CONFIG_SMALL("Pick median pixels from successive frames."),
+ .priv_size = sizeof(XMedianContext),
+ .priv_class = &tmedian_class,
+ .query_formats = query_formats,
+ .inputs = tmedian_inputs,
+ .outputs = tmedian_outputs,
+ .init = init,
+ .uninit = uninit,
+ .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS,
+};
+
+#endif /* CONFIG_TMEDIAN_FILTER */
More information about the ffmpeg-cvslog
mailing list