From patchwork Mon Apr 13 14:52:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18917 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DE69B44BAA9 for ; Mon, 13 Apr 2020 17:52:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B936668B930; Mon, 13 Apr 2020 17:52:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F1DD68B210 for ; Mon, 13 Apr 2020 17:52:24 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id x18so6131080wrq.2 for ; Mon, 13 Apr 2020 07:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=CIkBAhTk/QDAwI8bf/BvcZgjHPGPopWBzv2cHHaxHH0=; b=CqPoXwzMEaip03ha92DuwYscvVHs3IkLi7QDX+gg2gjvW8NpqRIu4u6cqyO8Vh4VTd VMbQ7Cmg94WwolEQZnzQyvBUBHRYsaN0tjDOxS6urYgUTB/LTBtc8qabHfFAuXOtcwT1 s2Bk8bPqPbjtUq8d80D4ygPZI95pjraJnBIWpWxskCtv3RE/a46OcdxVXLpchB6AfaJ5 c/HRwbx44R+Aa0iqrwy6bdERtlvIHT3mlc9Y3TexwyKskISGhCnPYTmUyd+1Rbs2feLP l8q+jeG52rTFP4+QJB7Jx64ioLcKbarqDvYmlMxGPmp0PDjxH4CULpXUgIsE0L3ki0BB 3GNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=CIkBAhTk/QDAwI8bf/BvcZgjHPGPopWBzv2cHHaxHH0=; b=eI1092JEWX5c9cmYYdgswb0+PBLOro68N3cHCMkaYUXSB73A17yLuKd0wP3Gug31cJ cpvLBFSuU93Ym0PqJ3vtlCDwI47mRou3bSUjaG3Y3VGgZJ+/EwRdpZH2TbXPAYeny6qO zgiQQhKzr8yGf1TKCtNbzqDd7ICBk0Q3T4TGP7jAtOAAlWjn8zKykVrraxykTgvvmbXL 2kXi/fIkchE7m+lEEwJsSWZYDZVH7O0wiOCaqI4A+ictuEsQmBsKVLS8yfq0IniJzDBt eo2MvuD+N+V+nu1EEVffBjQiJYFyUNVglkrB2LmVFiz/G0ajDPs9RRyxGzHVYYYWP+w3 567A== X-Gm-Message-State: AGi0PuZfgdRUPuV+sn8MrbsVk+tmodWE9KZr7NuXHhOXrGF1v34ODKow vxG9Xj+5R4N/ERbyzU0WU1yyPOs/ X-Google-Smtp-Source: APiQypLq9pCcwoB2FHCBex9lRPALchia5e6xAGZbxjuTzt3LPTr3R+6ysPEAFCvdzeRsdVGfzO/YfQ== X-Received: by 2002:a5d:4fcf:: with SMTP id h15mr18714078wrw.262.1586789543587; Mon, 13 Apr 2020 07:52:23 -0700 (PDT) Received: from localhost.localdomain ([94.250.184.60]) by smtp.gmail.com with ESMTPSA id n6sm15338435wrs.81.2020.04.13.07.52.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 07:52:22 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 16:52:15 +0200 Message-Id: <20200413145215.16949-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add tmedian filter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- doc/filters.texi | 19 +++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_xmedian.c | 108 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 124 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a4f99ef376..60c899490a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18371,6 +18371,25 @@ enabled for @option{mode} @var{interleave_top} and @var{interleave_bottom}. @end table +@section tmedian +Pick median pixels from several successive input video frames. + +The filter accepts the following options: + +@table @option +@item radius +Set radius of median filter. +Default is 1. Allowed range is from 1 to 127. + +@item planes +Set which planes to filter. Default value is @code{15}, by which all planes are processed. + +@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. +@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/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 */