From patchwork Fri Apr 27 22:56:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8678 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1149009jad; Fri, 27 Apr 2018 15:57:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoZO3xZ+dg4bwK6eP+E2AgMo3zHidmrpbCnhMQvaKS/KtYqJeGk+cGC2aHgJa5yprGOOiWP X-Received: by 10.28.147.83 with SMTP id v80mr2434206wmd.91.1524869860506; Fri, 27 Apr 2018 15:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524869860; cv=none; d=google.com; s=arc-20160816; b=rFqGrUbbJWUIP5LSTnr+zbBNgGz4+hbH0GogIPehDnpD0nXMuntywIn0D5vRlI+ToQ uP4+wpuDrOOYM/aCTdQUnbcQW8LUezSXBq+VK4fJDlHyQmjoQfo/1hDDQ0RZGCOEzMVf rA7hxxqosNENUy/qMZsanAlNP9l/X8ThrMZv5ECgFCkn4kGgBxb1yhD1WMpgn6KBEP7B QSihdFuJBgTh4m5MmAVzi8iBHHE7s5i56S3JVTuPfpthC5YcMG4VzwcD/FL42dxto/cj 0IroyMRAXGEHRoscwrO9Mrklj2R3i6fZi6P7d5Rq74eUyi+kr4hpb+j+B9rsB6afZb3h bCOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=3Ht8H7z3DtofKOmPGXKjmbaRQMP9zG8Wu0ymEWQ/k5A=; b=itIAlSe6eOGchMwon4qzIaMlRZ0WAOVhAdXZ7i4EDdJQ17Y6hO8hTTh+UfWFowGB0J L2rrSTzX4j54V1UiML5nvmmYt/Blwk/+uWVO5F+wotC//2yCGDrjCXWwpztD1gmp7N/w wMZ+MElbMoN3pMaLjd0DWiIn1F6VYdp0C/TYHecBScOcT+f1pycbJFxU5llFJKQrRsda i2V7CSqBHu3dzXcH9z82XDws3f8mPIxnKDy2/4jc8SMNRbWy41vaiZt9bXHgbZygIxSF sfqRrPUdIJEKGp7jIt6M8Ld+KZfXsQ0IfpuUAKdk7b3SvD3xOg8csyRAJwQjReYS6VSM k6NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YNBl18c4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q49-v6si1763797wrb.342.2018.04.27.15.57.39; Fri, 27 Apr 2018 15:57:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YNBl18c4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34C6868A63A; Sat, 28 Apr 2018 01:57:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBDDB68A5A7 for ; Sat, 28 Apr 2018 01:57:00 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id b21so5399088wme.4 for ; Fri, 27 Apr 2018 15:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=0KkderTtUgDCs4pO0byMvrH66woeus0cGdszHyaq4vY=; b=YNBl18c4EpZrv2h3hXjMCAkixL70ggfFyEiJVqTWV1GgeL36U+YVQwMHqnGKPcXO7h WmIF0v4HDmjx+2bZm8Kli11oiqV4G560EjjrzhO8lfdwsUXyZie0m6IrmDEpMV6XXyZu k3i2SIMasfa4AeAJYzS3xE6G2DqhhraKqkaqAyBjuB3T0Hne/M3bXuEE5JzI4Kcnt2qz Lgfyp0VqyDU6por0ttpdjfk0woKFAmgjqtlxtWHeLL9fPsaBc8XG29W3aNJSTDguJLmL 7XHrGrblQP2mGbxbqWmF1Eo161nqm/cWvzVBL0i/UGURn7W1Z3vridQuVuHuAzGl7ge6 XTvQ== 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:in-reply-to :references; bh=0KkderTtUgDCs4pO0byMvrH66woeus0cGdszHyaq4vY=; b=QZ2ulnD2xoWSf3bYTjTOGccpm2qRhjoyoqfy+YoBwQGFrJujgLFU0+f5jjJmxGcCBi 5njr7zvuNbte6aN0WS3q0wrSQlChq7i4OoQ4N6TRlEJENTdUPOvJ8AUrER18pFGWENY9 7w0nLr6yOTU/+x2RB/syGVCTyqQUSHowzVWPI4lXce89BYJi2hUlZa7SZg+941dWbbPG yqph6gU5lESefnmmwUiMFtZs/7SuiV/ZfbgID1qXD1oVNmr7ekRSpbt/uP+3k/CQvyc0 N1JRcP7wLWYVhu7XpJebgfEXLK+eikbYuuNnaMh4tIGE8Q8CTMYt0bOzHsCRmXOfmGqF v9vw== X-Gm-Message-State: ALQs6tAv5BSz6DtcOMNH/SnxSbndfi4dagj843/JQ6/rZH/24hkSaqdx UpSNM5y0f9OpkoDel20rUcnKcg== X-Received: by 10.28.71.146 with SMTP id m18mr2320927wmi.144.1524869850839; Fri, 27 Apr 2018 15:57:30 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id o101-v6sm3208694wrb.44.2018.04.27.15.57.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 15:57:30 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Apr 2018 00:56:48 +0200 Message-Id: <20180427225648.25811-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180427180010.1923-1-onemda@gmail.com> References: <20180427180010.1923-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH] avfilter: add amplify 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 | 24 ++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_amplify.c | 290 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 316 insertions(+) create mode 100644 libavfilter/vf_amplify.c diff --git a/doc/filters.texi b/doc/filters.texi index 44e0801f9c..48a13d7791 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -5187,6 +5187,30 @@ input reaches end of stream. This will cause problems if your encoding pipeline drops frames. If you're trying to apply an image as an overlay to a video stream, consider the @var{overlay} filter instead. +@section amplify + +Amplify differences between current pixel and pixels of adjacent frames in +same pixel location. + +This filter accepts the following options: + +@table @option +@item radius +Set frame radius. Default is 2. Allowed range is from 1 to 63. +For example radius of 3 will instruct filter to calculate average of 7 frames. + +@item factor +Set factor to amplify difference. Default is 2. Allowed range is from 0 to 65535. + +@item threshold +Set threshold for difference amplification. Any differrence greater or equal to +this value will not alter source pixel. Default is 10. +Allowed range is from 0 to 65535. + +@item planes +Set which planes to filter. Default is all. Allowed range is from 0 to 15. +@end table + @section ass Same as the @ref{subtitles} filter, except that it doesn't require libavcodec diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 7f8317c2f2..3454f25e7d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -138,6 +138,7 @@ OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o # video filters OBJS-$(CONFIG_ALPHAEXTRACT_FILTER) += vf_extractplanes.o OBJS-$(CONFIG_ALPHAMERGE_FILTER) += vf_alphamerge.o +OBJS-$(CONFIG_AMPLIFY_FILTER) += vf_amplify.o OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o OBJS-$(CONFIG_ATADENOISE_FILTER) += vf_atadenoise.o OBJS-$(CONFIG_AVGBLUR_FILTER) += vf_avgblur.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 35e12d595f..d958f9b2da 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -132,6 +132,7 @@ extern AVFilter ff_asink_anullsink; extern AVFilter ff_vf_alphaextract; extern AVFilter ff_vf_alphamerge; +extern AVFilter ff_vf_amplify; extern AVFilter ff_vf_ass; extern AVFilter ff_vf_atadenoise; extern AVFilter ff_vf_avgblur; diff --git a/libavfilter/vf_amplify.c b/libavfilter/vf_amplify.c new file mode 100644 index 0000000000..8e8c2ebd20 --- /dev/null +++ b/libavfilter/vf_amplify.c @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2018 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/intreadwrite.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" + +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +typedef struct AmplifyContext { + const AVClass *class; + const AVPixFmtDescriptor *desc; + int radius; + float factor; + float threshold; + int planes; + + int nb_inputs; + int nb_frames; + + int depth; + int max; + int nb_planes; + int linesize[4]; + int height[4]; + + AVFrame **frames; +} AmplifyContext; + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pixel_fmts[] = { + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, + AV_PIX_FMT_GRAY16, + AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, + AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUVJ411P, + 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_YUV440P10, + AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12, + AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV420P14, + AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, + 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_NONE + }; + AVFilterFormats *formats = ff_make_format_list(pixel_fmts); + if (!formats) + return AVERROR(ENOMEM); + return ff_set_common_formats(ctx, formats); +} + +static av_cold int init(AVFilterContext *ctx) +{ + AmplifyContext *s = ctx->priv; + + s->nb_inputs = s->radius * 2 + 1; + + s->frames = av_calloc(s->nb_inputs, sizeof(*s->frames)); + if (!s->frames) + return AVERROR(ENOMEM); + + return 0; +} + +typedef struct ThreadData { + AVFrame **in, *out; +} ThreadData; + +static int amplify_frame(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + AmplifyContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame **in = td->in; + AVFrame *out = td->out; + const int radius = s->radius; + const int nb_inputs = s->nb_inputs; + const float threshold = s->threshold; + const float factor = s->factor; + int i, p, x, y; + + if (s->depth <= 8) { + for (p = 0; p < s->nb_planes; p++) { + const int slice_start = (s->height[p] * jobnr) / nb_jobs; + const int slice_end = (s->height[p] * (jobnr+1)) / nb_jobs; + uint8_t *dst = out->data[p] + slice_start * out->linesize[p]; + + if (!((1 << p) & s->planes)) { + av_image_copy_plane(dst, out->linesize[p], + in[radius]->data[p] + slice_start * in[radius]->linesize[p], + in[radius]->linesize[p], + s->linesize[p], slice_end - slice_start); + continue; + } + + for (y = slice_start; y < slice_end; y++) { + for (x = 0; x < s->linesize[p]; x++) { + int src = in[radius]->data[p][y * in[radius]->linesize[p] + x]; + float diff, avg; + int sum = 0; + + for (i = 0; i < nb_inputs; i++) { + sum += in[i]->data[p][y * in[i]->linesize[p] + x]; + } + + avg = sum / (float)nb_inputs; + diff = src - avg; + if (fabsf(diff) < threshold) + dst[x] = av_clip_uint8(src + diff * factor); + else + dst[x] = src; + } + + dst += out->linesize[p]; + } + } + } else { + for (p = 0; p < s->nb_planes; p++) { + const int slice_start = (s->height[p] * jobnr) / nb_jobs; + const int slice_end = (s->height[p] * (jobnr+1)) / nb_jobs; + uint16_t *dst = (uint16_t *)(out->data[p] + slice_start * out->linesize[p]); + + if (!((1 << p) & s->planes)) { + av_image_copy_plane((uint8_t *)dst, out->linesize[p], + in[radius]->data[p] + slice_start * in[radius]->linesize[p], + in[radius]->linesize[p], + s->linesize[p], slice_end - slice_start); + continue; + } + + for (y = slice_start; y < slice_end; y++) { + for (x = 0; x < s->linesize[p] / 2; x++) { + int src = AV_RN16(in[radius]->data[p] + y * in[radius]->linesize[p] + x * 2); + float diff, avg; + int sum = 0; + + for (i = 0; i < nb_inputs; i++) { + sum += AV_RN16(in[i]->data[p] + y * in[i]->linesize[p] + x * 2); + } + + avg = sum / (float)nb_inputs; + diff = src - avg; + + if (fabsf(diff) < threshold) + dst[x] = av_clip(src + (src - avg) * factor, 0, s->max); + else + dst[x] = src; + } + + dst += out->linesize[p] / 2; + } + } + } + + return 0; +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AmplifyContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + int ret; + + s->desc = av_pix_fmt_desc_get(outlink->format); + if (!s->desc) + return AVERROR_BUG; + s->nb_planes = av_pix_fmt_count_planes(outlink->format); + s->depth = s->desc->comp[0].depth; + s->max = (1 << s->depth) - 1; + + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) + return ret; + + s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); + s->height[0] = s->height[3] = inlink->h; + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + AmplifyContext *s = ctx->priv; + int i; + + for (i = 0; i < s->nb_frames; i++) + av_frame_free(&s->frames[i]); + av_freep(&s->frames); +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + AmplifyContext *s = ctx->priv; + ThreadData td; + AVFrame *out; + + if (s->nb_frames < s->nb_inputs) { + s->frames[s->nb_frames] = in; + s->nb_frames++; + 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; + } + + 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, amplify_frame, &td, NULL, FFMIN(s->height[1], ff_filter_get_nb_threads(ctx))); + + return ff_filter_frame(outlink, out); +} + +#define OFFSET(x) offsetof(AmplifyContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption amplify_options[] = { + { "radius", "set radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=2}, 1, 63, .flags = FLAGS }, + { "factor", "set factor", OFFSET(factor), AV_OPT_TYPE_FLOAT, {.dbl=2}, 0, UINT16_MAX, .flags = FLAGS }, + { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_FLOAT, {.dbl=10}, 0, UINT16_MAX, .flags = FLAGS }, + { "planes", "set what planes to filter", OFFSET(planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 0, 15, FLAGS }, + { NULL }, +}; + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(amplify); + +AVFilter ff_vf_amplify = { + .name = "amplify", + .description = NULL_IF_CONFIG_SMALL("Amplify changes between successive video frames."), + .priv_size = sizeof(AmplifyContext), + .priv_class = &lify_class, + .query_formats = query_formats, + .outputs = outputs, + .inputs = inputs, + .init = init, + .uninit = uninit, + .flags = AVFILTER_FLAG_SLICE_THREADS, +};