From patchwork Sun Oct 20 18:49:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15865 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 D730544738C for ; Sun, 20 Oct 2019 21:49:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD21368AF6B; Sun, 20 Oct 2019 21:49:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25DD968AF13 for ; Sun, 20 Oct 2019 21:49:28 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id s1so2601666wro.0 for ; Sun, 20 Oct 2019 11:49:28 -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=YzW+cN+v24Gbrej65fvacbjQO1ovL4YJyCGWHV/wRlw=; b=XZ0b0u8x1OJGMQPTvd6tyaPLepsUrdlvmSfvJRGbr+SaDNJkDDzKCMbjSChHfebZOJ htSGw+N7FQfsjb8gK8dUsgkKHeaYoaMAbSat1ue/DYr0xuEw0C/I4UXXdNJhFaX8OToB F0J/hvOJtzKl+WnyjVuC0dky5YTOTWKpNl26Tz+gK7DhdFFzvzHxJkBqERYXOv2o5ECN 08kBJUA7o79fIT8j24RfDPM1FcGWx9xBilVmAinUAvf7+1A0JyphiSDS/U3uP77nS/03 23ro8IqsP9JKMVI7mTmS8zJ3unCOWiDTw74QrDSv+zxpT8VhWqs2EGP/sKmExfpUINdV LjZg== 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=YzW+cN+v24Gbrej65fvacbjQO1ovL4YJyCGWHV/wRlw=; b=QjXjPDWR0y8GGDsea3JV9wAnETfoZh3JFiFny1OstCDDltSpquGI1C/o4gq7yS7DwQ kB9biVXwUl7uOmW5xYcGxVlLoJWDMgw4PXA3GqWSzTXwmnuweZObdCYOOakNJpzVscH1 6C2pA2Mi+o7VRC04sOYW90nbm5mo1sqlfKqhK/eDisqvThbDe8V2KciLoRvo7YyHtzRW I4UHJq2Q1MPzvWhxrX4UVNk9pNXqFOJ18/dNn05zfsEnaQNvOIzuOD71/RxnrN9SadzE RczB3+JNjdhdbj1pWCh8TjYNpNixtDThFytnJuz4OVCmcba3F0YimNAdKRlDoAjsJdaP wzRQ== X-Gm-Message-State: APjAAAUL2oL6FTZ5Z7xWOlzAlLsxfjERPxHsA6BrR+4i1eNLP2H8cLGT bBrJI2W4EeVEYPgEFO1MDC20rNu6TRg= X-Google-Smtp-Source: APXvYqwtymzqGdWbz/HtO8E9NyiysplW5bzQ7Ae/qKq+sRgtrOcVcJ5YK85goDfgtGoWLf4/6t+KJQ== X-Received: by 2002:adf:fdd0:: with SMTP id i16mr10087406wrs.227.1571597366821; Sun, 20 Oct 2019 11:49:26 -0700 (PDT) Received: from localhost.localdomain ([212.15.160.218]) by smtp.gmail.com with ESMTPSA id u1sm11267623wmc.38.2019.10.20.11.49.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 11:49:25 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Oct 2019 20:49:16 +0200 Message-Id: <20191020184916.16370-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter: add maskedmin/maskedmax filters 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 | 32 +++ libavfilter/Makefile | 2 + libavfilter/allfilters.c | 2 + libavfilter/vf_maskedminmax.c | 359 ++++++++++++++++++++++++++++++++++ 4 files changed, 395 insertions(+) create mode 100644 libavfilter/vf_maskedminmax.c diff --git a/doc/filters.texi b/doc/filters.texi index db4313da37..45986f4b62 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12644,6 +12644,22 @@ copied from first stream. By default value 0xf, all planes will be processed. @end table +@section maskedmax + +Merge the second and third input stream into output stream using absolute differences +between second input stream and first input stream and absolute difference between +third input stream and first input stream. The picked value will be from second input +stream if second absolute difference is greater than first one or from third input stream +otherwise. + +This filter accepts the following options: +@table @option +@item planes +Set which planes will be processed as bitmap, unprocessed planes will be +copied from first stream. +By default value 0xf, all planes will be processed. +@end table + @section maskedmerge Merge the first input stream with the second input stream using per pixel @@ -12663,6 +12679,22 @@ copied from first stream. By default value 0xf, all planes will be processed. @end table +@section maskedmin + +Merge the second and third input stream into output stream using absolute differences +between second input stream and first input stream and absolute difference between +third input stream and first input stream. The picked value will be from second input +stream if second absolute difference is less than first one or from third input stream +otherwise. + +This filter accepts the following options: +@table @option +@item planes +Set which planes will be processed as bitmap, unprocessed planes will be +copied from first stream. +By default value 0xf, all planes will be processed. +@end table + @section maskfun Create mask from input video. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index e9ac54daee..44f3fa31f1 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -291,7 +291,9 @@ OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o OBJS-$(CONFIG_MASKEDCLAMP_FILTER) += vf_maskedclamp.o framesync.o +OBJS-$(CONFIG_MASKEDMAX_FILTER) += vf_maskedminmax.o framesync.o OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync.o +OBJS-$(CONFIG_MASKEDMIN_FILTER) += vf_maskedminmax.o framesync.o OBJS-$(CONFIG_MASKFUN_FILTER) += vf_maskfun.o OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index a7a165e0d8..fdaf3ce40c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -276,7 +276,9 @@ extern AVFilter ff_vf_lut3d; extern AVFilter ff_vf_lutrgb; extern AVFilter ff_vf_lutyuv; extern AVFilter ff_vf_maskedclamp; +extern AVFilter ff_vf_maskedmax; extern AVFilter ff_vf_maskedmerge; +extern AVFilter ff_vf_maskedmin; extern AVFilter ff_vf_maskfun; extern AVFilter ff_vf_mcdeint; extern AVFilter ff_vf_mergeplanes; diff --git a/libavfilter/vf_maskedminmax.c b/libavfilter/vf_maskedminmax.c new file mode 100644 index 0000000000..1ba2111328 --- /dev/null +++ b/libavfilter/vf_maskedminmax.c @@ -0,0 +1,359 @@ +/* + * Copyright (c) 2019 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/pixdesc.h" +#include "libavutil/opt.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" +#include "framesync.h" + +#define OFFSET(x) offsetof(MaskedMinMaxContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +typedef struct ThreadData { + AVFrame *src, *f1, *f2, *dst; +} ThreadData; + +typedef struct MaskedMinMaxContext { + const AVClass *class; + + int planes; + int maskedmin; + + int linesize[4]; + int planewidth[4], planeheight[4]; + int nb_planes; + int depth; + FFFrameSync fs; + + void (*maskedminmax)(const uint8_t *src, uint8_t *dst, const uint8_t *f1, const uint8_t *f2, int w); +} MaskedMinMaxContext; + +static const AVOption maskedminmax_options[] = { + { "planes", "set planes", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS }, + { NULL } +}; + +static av_cold int init(AVFilterContext *ctx) +{ + MaskedMinMaxContext *s = ctx->priv; + + s->maskedmin = !strcmp(ctx->filter->name, "maskedmin"); + + return 0; +} + +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_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 void maskedmin8(const uint8_t *src, uint8_t *dst, const uint8_t *f1, const uint8_t *f2, int w) +{ + for (int x = 0; x < w; x++) + dst[x] = FFABS(src[x] - f2[x]) < FFABS(src[x] - f1[x]) ? f2[x] : f1[x]; +} + +static void maskedmax8(const uint8_t *src, uint8_t *dst, const uint8_t *f1, const uint8_t *f2, int w) +{ + for (int x = 0; x < w; x++) + dst[x] = FFABS(src[x] - f2[x]) > FFABS(src[x] - f1[x]) ? f2[x] : f1[x]; +} + +static void maskedmin16(const uint8_t *ssrc, uint8_t *ddst, const uint8_t *ff1, const uint8_t *ff2, int w) +{ + const uint16_t *src = (const uint16_t *)ssrc; + const uint16_t *f1 = (const uint16_t *)ff1; + const uint16_t *f2 = (const uint16_t *)ff2; + uint16_t *dst = (uint16_t *)ddst; + + for (int x = 0; x < w; x++) + dst[x] = FFABS(src[x] - f2[x]) < FFABS(src[x] - f1[x]) ? f2[x] : f1[x]; +} + +static void maskedmax16(const uint8_t *ssrc, uint8_t *ddst, const uint8_t *ff1, const uint8_t *ff2, int w) +{ + const uint16_t *src = (const uint16_t *)ssrc; + const uint16_t *f1 = (const uint16_t *)ff1; + const uint16_t *f2 = (const uint16_t *)ff2; + uint16_t *dst = (uint16_t *)ddst; + + for (int x = 0; x < w; x++) + dst[x] = FFABS(src[x] - f2[x]) > FFABS(src[x] - f1[x]) ? f2[x] : f1[x]; +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + MaskedMinMaxContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int vsub, hsub, ret; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) + return ret; + + hsub = desc->log2_chroma_w; + vsub = desc->log2_chroma_h; + s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, vsub); + s->planeheight[0] = s->planeheight[3] = inlink->h; + s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, hsub); + s->planewidth[0] = s->planewidth[3] = inlink->w; + + s->depth = desc->comp[0].depth; + + if (desc->comp[0].depth == 8) + s->maskedminmax = s->maskedmin ? maskedmin8 : maskedmax8; + else + s->maskedminmax = s->maskedmin ? maskedmin16 : maskedmax16; + + return 0; +} + +static int maskedminmax_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + MaskedMinMaxContext *s = ctx->priv; + ThreadData *td = arg; + + for (int p = 0; p < s->nb_planes; p++) { + const ptrdiff_t src_linesize = td->src->linesize[p]; + const ptrdiff_t f1_linesize = td->f1->linesize[p]; + const ptrdiff_t f2_linesize = td->f2->linesize[p]; + const ptrdiff_t dst_linesize = td->dst->linesize[p]; + const int w = s->planewidth[p]; + const int h = s->planeheight[p]; + const int slice_start = (h * jobnr) / nb_jobs; + const int slice_end = (h * (jobnr+1)) / nb_jobs; + const uint8_t *src = td->src->data[p] + slice_start * src_linesize; + const uint8_t *f1 = td->f1->data[p] + slice_start * f1_linesize; + const uint8_t *f2 = td->f2->data[p] + slice_start * f2_linesize; + uint8_t *dst = td->dst->data[p] + slice_start * dst_linesize; + + if (!((1 << p) & s->planes)) { + av_image_copy_plane(dst, dst_linesize, src, src_linesize, + s->linesize[p], slice_end - slice_start); + continue; + } + + for (int y = slice_start; y < slice_end; y++) { + s->maskedminmax(src, dst, f1, f2, w); + + dst += dst_linesize; + src += src_linesize; + f1 += f1_linesize; + f2 += f2_linesize; + } + } + + return 0; +} + +static int process_frame(FFFrameSync *fs) +{ + AVFilterContext *ctx = fs->parent; + MaskedMinMaxContext *s = fs->opaque; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out, *src, *f1, *f2; + int ret; + + if ((ret = ff_framesync_get_frame(&s->fs, 0, &src, 0)) < 0 || + (ret = ff_framesync_get_frame(&s->fs, 1, &f1, 0)) < 0 || + (ret = ff_framesync_get_frame(&s->fs, 2, &f2, 0)) < 0) + return ret; + + if (ctx->is_disabled) { + out = av_frame_clone(src); + if (!out) + return AVERROR(ENOMEM); + } else { + ThreadData td; + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) + return AVERROR(ENOMEM); + av_frame_copy_props(out, src); + + td.src = src; + td.f1 = f1; + td.f2 = f2; + td.dst = out; + + ctx->internal->execute(ctx, maskedminmax_slice, &td, NULL, FFMIN(s->planeheight[0], + ff_filter_get_nb_threads(ctx))); + } + out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); + + return ff_filter_frame(outlink, out); +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + MaskedMinMaxContext *s = ctx->priv; + AVFilterLink *source = ctx->inputs[0]; + AVFilterLink *f1 = ctx->inputs[1]; + AVFilterLink *f2 = ctx->inputs[2]; + FFFrameSyncIn *in; + int ret; + + if (source->format != f1->format || + source->format != f2->format) { + av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); + return AVERROR(EINVAL); + } + if (source->w != f1->w || source->h != f1->h || + source->w != f2->w || source->h != f2->h) { + av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " + "(size %dx%d) do not match the corresponding " + "second input link %s parameters (%dx%d) " + "and/or third input link %s parameters (size %dx%d)\n", + ctx->input_pads[0].name, source->w, source->h, + ctx->input_pads[1].name, f1->w, f1->h, + ctx->input_pads[2].name, f2->w, f2->h); + return AVERROR(EINVAL); + } + + outlink->w = source->w; + outlink->h = source->h; + outlink->sample_aspect_ratio = source->sample_aspect_ratio; + outlink->frame_rate = source->frame_rate; + + if ((ret = ff_framesync_init(&s->fs, ctx, 3)) < 0) + return ret; + + in = s->fs.in; + in[0].time_base = source->time_base; + in[1].time_base = f1->time_base; + in[2].time_base = f2->time_base; + in[0].sync = 1; + in[0].before = EXT_STOP; + in[0].after = EXT_INFINITY; + in[1].sync = 1; + in[1].before = EXT_STOP; + in[1].after = EXT_INFINITY; + in[2].sync = 1; + in[2].before = EXT_STOP; + in[2].after = EXT_INFINITY; + s->fs.opaque = s; + s->fs.on_event = process_frame; + + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; +} + +static int activate(AVFilterContext *ctx) +{ + MaskedMinMaxContext *s = ctx->priv; + return ff_framesync_activate(&s->fs); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + MaskedMinMaxContext *s = ctx->priv; + + ff_framesync_uninit(&s->fs); +} + +static const AVFilterPad maskedminmax_inputs[] = { + { + .name = "source", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + }, + { + .name = "filter1", + .type = AVMEDIA_TYPE_VIDEO, + }, + { + .name = "filter2", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +static const AVFilterPad maskedminmax_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, + { NULL } +}; + +#define maskedmin_options maskedminmax_options +AVFILTER_DEFINE_CLASS(maskedmin); + +AVFilter ff_vf_maskedmin = { + .name = "maskedmin", + .description = NULL_IF_CONFIG_SMALL("Apply filtering with minimum difference of two streams."), + .priv_class = &maskedmin_class, + .priv_size = sizeof(MaskedMinMaxContext), + .init = init, + .uninit = uninit, + .activate = activate, + .query_formats = query_formats, + .inputs = maskedminmax_inputs, + .outputs = maskedminmax_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, +}; + +#define maskedmax_options maskedminmax_options +AVFILTER_DEFINE_CLASS(maskedmax); + +AVFilter ff_vf_maskedmax = { + .name = "maskedmax", + .description = NULL_IF_CONFIG_SMALL("Apply filtering with maximum difference of two streams."), + .priv_class = &maskedmax_class, + .priv_size = sizeof(MaskedMinMaxContext), + .init = init, + .uninit = uninit, + .activate = activate, + .query_formats = query_formats, + .inputs = maskedminmax_inputs, + .outputs = maskedminmax_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, +};