From patchwork Wed May 27 12:22:34 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: 19901 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 6C56F4497A8 for ; Wed, 27 May 2020 15:22:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B49068AC09; Wed, 27 May 2020 15:22:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16A8168AAA0 for ; Wed, 27 May 2020 15:22:45 +0300 (EEST) Received: by mail-ed1-f51.google.com with SMTP id e10so20093747edq.0 for ; Wed, 27 May 2020 05:22:45 -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=qHqKxDgKagYkynhjKNxuy7o8iAUnvZboqMMoFkHsMWc=; b=aHsB5cEyDCyya7x52qFUypO9cgOUei/sL0OYqLeLryygGWt5M1iCliKovcgCkzmg+a c2zg3e2cPGtJwvD1bOWFqsOu5EXCxlv+09gU0c4SSLMC70XCCPSUtXt0xdHQDEsUOO0e 26KZQIJ3hrlvmTMgOx4Ag0q0e3slfUUOLQ1yb7y8Hx58Zyzc9mVOTlwfRofdglIo9IlR IVf35PpHj2D9N/qCosiVQla3q0nGsijC/0/GU035MZh49Nb07v5EoGMV5ny6+UyE2/8d 87BwQEyN1hTqi5tw5sQLdmJwYj2yK9SsuDgXKM0Y6jHWYdQyi/wLzSqA6CyPbBizK50V J1rQ== 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=qHqKxDgKagYkynhjKNxuy7o8iAUnvZboqMMoFkHsMWc=; b=oHZjM3EGrt+12DdbPdX8TlFoN4h5IOw5Q6f3VBfO8jU0ee8hMg2BHQC3qCp/K1uBA9 Zt5TCs4wmogfWboBrOGm0F4KEOicX9n8HBDQoMJsS7VmUGaKHda2ycYOa5qgl5OfJhvN 7UmQkcGV08SOrN2GyH9fXaYvcpmf3sSKFrswO7D5RgFkxFgSoYM4dMPSnFydjvFaeRBB 3RWEba8XHK/mgOLDB+dhRQCbkdQbY74BMtQ+yZJ5gNatwsb5rnpkVWQHHWmcDEyVYJte KmlxjJyu5jV+U/inFJUK0UFN6i7ctMnsCai86sXv4965IoVLNOiqhZ/dihuGgpiMzv7i tG4A== X-Gm-Message-State: AOAM531+qQ9SpQ93od5LTRm1a93zjJPhwGSusjDnVOJfI1nnyC8ACCC3 tUl4PyL91SxDHVqi0RKhNWXAjghJndY= X-Google-Smtp-Source: ABdhPJxalguG9T8Jyp+l0plED2xDjqEVY5bpyLbQVXhXRYQgOirQC6KAPrg3bdHMIoVWLqHpScpxMg== X-Received: by 2002:aa7:d8d3:: with SMTP id k19mr23987985eds.348.1590582163641; Wed, 27 May 2020 05:22:43 -0700 (PDT) Received: from localhost.localdomain ([37.244.239.188]) by smtp.gmail.com with ESMTPSA id h1sm1107190edz.88.2020.05.27.05.22.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 05:22:42 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 14:22:34 +0200 Message-Id: <20200527122234.2671-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add dblur video 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 | 23 +++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_dblur.c | 307 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 332 insertions(+) create mode 100644 libavfilter/vf_dblur.c diff --git a/doc/filters.texi b/doc/filters.texi index 7675a0e9b1..c5fc2da8bc 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8633,6 +8633,29 @@ Set background opacity. Set display number format. Can be @code{hex}, or @code{dec}. Default is @code{hex}. @end table +@section dblur +Apply Directional blur filter. + +The filter accepts the following options: + +@table @option +@item angle +Set angle of directional blur. Default is @code{45}. + +@item radius +Set radius of directional blur. Default is @code{5}. + +@item planes +Set which planes to filter. By default all planes are filtered. +@end table + +@subsection Commands +This filter supports same @ref{commands} as options. +The command accepts the same syntax of the corresponding option. + +If the specified expression is not valid, it is kept at its current +value. + @section dctdnoiz Denoise frames using 2D DCT (frequency domain filtering). diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 497297d0a6..6ffad8381b 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -206,6 +206,7 @@ OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.o OBJS-$(CONFIG_CUE_FILTER) += f_cue.o OBJS-$(CONFIG_CURVES_FILTER) += vf_curves.o OBJS-$(CONFIG_DATASCOPE_FILTER) += vf_datascope.o +OBJS-$(CONFIG_DBLUR_FILTER) += vf_dblur.o OBJS-$(CONFIG_DCTDNOIZ_FILTER) += vf_dctdnoiz.o OBJS-$(CONFIG_DEBAND_FILTER) += vf_deband.o OBJS-$(CONFIG_DEBLOCK_FILTER) += vf_deblock.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9605ce9367..520816be5e 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -194,6 +194,7 @@ extern AVFilter ff_vf_cropdetect; extern AVFilter ff_vf_cue; extern AVFilter ff_vf_curves; extern AVFilter ff_vf_datascope; +extern AVFilter ff_vf_dblur; extern AVFilter ff_vf_dctdnoiz; extern AVFilter ff_vf_deband; extern AVFilter ff_vf_deblock; diff --git a/libavfilter/vf_dblur.c b/libavfilter/vf_dblur.c new file mode 100644 index 0000000000..cc127da73f --- /dev/null +++ b/libavfilter/vf_dblur.c @@ -0,0 +1,307 @@ +/* + * Copyright (c) 2020 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +typedef struct DBlurContext { + const AVClass *class; + + float angle; + float radius; + int planes; + + float b0, b1, q, c, R3; + + int depth; + int planewidth[4]; + int planeheight[4]; + float *buffer; + int nb_planes; + void (*horiz_slice)(float *buffer, int width, int height, int steps, float nu, float bscale); +} DBlurContext; + +#define OFFSET(x) offsetof(DBlurContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM + +static const AVOption dblur_options[] = { + { "angle", "set angle", OFFSET(angle), AV_OPT_TYPE_FLOAT, {.dbl=45}, 0.0, 360, FLAGS }, + { "radius", "set radius", OFFSET(radius), AV_OPT_TYPE_FLOAT, {.dbl=5}, 1, 8192, FLAGS }, + { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(dblur); + +#define f(n, m) (dst[(n) * width + (m)]) + +static int filter_horizontally(AVFilterContext *ctx, int width, int height) +{ + DBlurContext *s = ctx->priv; + const float b0 = s->b0; + const float b1 = s->b1; + const float q = s->q; + const float c = s->c; + float *dst = s->buffer; + float g; + + if (s->R3 > 0) { + for (int y = 1; y < height - 1; y++) { + g = q * f(0, 0) + c * f(0, 0); + for (int x = 0; x < width; x++) { + f(y, x) = b0 * f(y, x) + b1 * f(y - 1, x) + g; + g = q * f(y, x) + c * f(y - 1, x); + } + } + + for (int y = height - 2; y >= 0; y--) { + g = q * f(y, width - 1) + c * f(y, width - 1); + for (int x = width - 1; x >= 0; x--) { + f(y, x) = b0 * f(y, x) + b1 * f(y + 1, x) + g; + g = q * f(y, x) + c * f(y + 1, x); + } + } + } else { + for (int y = 1; y < height - 1; y++) { + g = q * f(0, width - 1) + c * f(0, width - 1); + for (int x = width - 1; x >= 0; x--) { + f(y, x) = b0 * f(y, x) + b1 * f(y - 1, x) + g; + g = q * f(y, x) + c * f(y - 1, x); + } + } + + for (int y = height - 2; y >= 0; y--) { + g = q * f(y, 0) + c * f(y, 0); + for (int x = 0; x < width; x++) { + f(y, x) = b0 * f(y, x) + b1 * f(y + 1, x) + g; + g = q * f(y, x) + c * f(y + 1, x); + } + } + } + + return 0; +} + +static void diriir2d(AVFilterContext *ctx, int plane) +{ + DBlurContext *s = ctx->priv; + const int width = s->planewidth[plane]; + const int height = s->planeheight[plane]; + + filter_horizontally(ctx, width, height); +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, + AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, + AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, + AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12, + AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, + AV_PIX_FMT_NONE + }; + + return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); +} + +static int config_input(AVFilterLink *inlink) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + DBlurContext *s = inlink->dst->priv; + + s->depth = desc->comp[0].depth; + s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w); + s->planewidth[0] = s->planewidth[3] = inlink->w; + s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); + s->planeheight[0] = s->planeheight[3] = inlink->h; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + s->buffer = av_malloc_array(FFALIGN(inlink->w, 16), FFALIGN(inlink->h, 16) * sizeof(*s->buffer)); + if (!s->buffer) + return AVERROR(ENOMEM); + + return 0; +} + +static void set_params(DBlurContext *s, float angle, float r) +{ + float mu, nu, R1, R2, w1, w2; + float a0, a1, a2, a3; + + angle = angle * M_PI / 180.f; + + mu = cosf(angle); + nu = sinf(angle); + R1 = (mu * r) * (mu * r); + R2 = (nu * r) * (nu * r); + s->R3 = mu * nu * r * r; + w1 = sqrtf(0.25f + R1); + w2 = sqrtf(0.25f + R2); + a0 = (w1 + 0.5f) * (w2 + 0.5f) - fabsf(s->R3); + a1 = 0.5f + w2 - a0; + a2 = 0.5f + w1 - a0; + a3 = a0 - w1 - w2; + s->b0 = 1.f / a0; + s->b1 = -a2 / a0; + s->q = -a1 / a0; + s->c = -a3 / a0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + DBlurContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out; + int plane; + + set_params(s, s->angle, s->radius); + + if (av_frame_is_writable(in)) { + out = in; + } else { + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); + } + + for (plane = 0; plane < s->nb_planes; plane++) { + const int height = s->planeheight[plane]; + const int width = s->planewidth[plane]; + float *bptr = s->buffer; + const uint8_t *src = in->data[plane]; + const uint16_t *src16 = (const uint16_t *)in->data[plane]; + uint8_t *dst = out->data[plane]; + uint16_t *dst16 = (uint16_t *)out->data[plane]; + int y, x; + + if (!(s->planes & (1 << plane))) { + if (out != in) + av_image_copy_plane(out->data[plane], out->linesize[plane], + in->data[plane], in->linesize[plane], + width * ((s->depth + 7) / 8), height); + continue; + } + + if (s->depth == 8) { + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + bptr[x] = src[x]; + } + bptr += width; + src += in->linesize[plane]; + } + } else { + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + bptr[x] = src16[x]; + } + bptr += width; + src16 += in->linesize[plane] / 2; + } + } + + diriir2d(ctx, plane); + + bptr = s->buffer; + if (s->depth == 8) { + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + dst[x] = bptr[x]; + } + bptr += width; + dst += out->linesize[plane]; + } + } else { + for (y = 0; y < height; y++) { + for (x = 0; x < width; x++) { + dst16[x] = bptr[x]; + } + bptr += width; + dst16 += out->linesize[plane] / 2; + } + } + } + + if (out != in) + av_frame_free(&in); + return ff_filter_frame(outlink, out); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + DBlurContext *s = ctx->priv; + + av_freep(&s->buffer); +} + +static const AVFilterPad dblur_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad dblur_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_dblur = { + .name = "dblur", + .description = NULL_IF_CONFIG_SMALL("Apply Directional Blur filter."), + .priv_size = sizeof(DBlurContext), + .priv_class = &dblur_class, + .uninit = uninit, + .query_formats = query_formats, + .inputs = dblur_inputs, + .outputs = dblur_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .process_command = ff_filter_process_command, +};