From patchwork Thu May 3 13:44:43 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: 8762 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1815457jad; Thu, 3 May 2018 06:45:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp0FEmff0FEFZe8s66GK6Bz+sXdq6UMM0LaDUuks8pxIT8D5eiQup+YhBLzOhdVx7DW0rm1 X-Received: by 2002:adf:e4cc:: with SMTP id v12-v6mr19500285wrm.243.1525355105049; Thu, 03 May 2018 06:45:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525355105; cv=none; d=google.com; s=arc-20160816; b=oRdsAEVltmejK/VtTZukfbXt73DYnwPQBlYOmygkWWeb6cj6xfFhvtMDfLLFCg+Diq /gm3tpDFZ5o1fjFTLuy0YueZ/AwTNDX79bcg+MvFBpxwWpXHknRjAp7BHVWkhzk5obFh KAy2+24Ba86BnbglLzyYSwQGreGzZbODjYe+XNFsqXI0QZmVM82LIzFZ/j+Wu8MtkYm+ qQbyx/+I8sG1eMI7Pj8BNG0su3q3I4Pk1Z6KTQT6ftdTGLkmnWI9gejIYD177WBSnsMA kjBDzzu42iPcr0Lba55CFzTdMjW26V2h+77F3WUtGbNfc8jOVE/h8N+YnjxFleMlhu0X H3LQ== 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=/9+1mzCGGUmSNJwiUyPQut/I/l/3hro2thTLPEqtT/4=; b=tFw10R/a387efX7/zTqEUNNJ9eV56d3Sq96M3qQ3GbjK9Upk171zyzgaKo0IC4kOKq bIz6hiVwrctJYYaXt1jDU6sO5uUTeueUlaZvj/+L2JfBLsxkSSvDve+36giXRFgo35Ww muPpChZpO/hUzaOzAfgJks6uYwOxGjTPizTBebG+8saRvRq7yeqof3dn2m+cc5iw7PYE eCBTdV03L7aJDjRWT/Wk8Eo7r+P3h8+X848WdWdCYZ5OuCxMN4VgTejp0Ngnb23QOWpc pe067jAssoH/7YK8pBWWuIVCJTt1DF2k4oHzq+ieFGjMVWGvTwdTLP0DcTeCFS+Imjbx gQ2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LQ3r9v7F; 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 l4-v6si10951041wre.311.2018.05.03.06.45.04; Thu, 03 May 2018 06:45:04 -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=LQ3r9v7F; 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 DEAB8689C54; Thu, 3 May 2018 16:44:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 875B7689A52 for ; Thu, 3 May 2018 16:44:22 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id l1so30582341wmb.2 for ; Thu, 03 May 2018 06:44:56 -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=ndYT0XuZo7IqMVHh34Ilwc9VmrZ75HdT+mqADRjX2MI=; b=LQ3r9v7F/I52FnwOjEhpWNAOryLlIrDVHJqKgTomBfQcNogOOwJr9xao7IPEkZGJtR 8HJdTluGCNkPelVjBKiroPtCkh43BTVm+85LzhLSPYNPDL0oUgkA3JnMycw5rV1h13IM d36bccAkglPYh36hqySt+QQWW2lzXwuIs8trJwcsAf3lZGZGk0N8u7cWZLwwEXnbYMgh BlDf3IABgGETEBMImnxIxKx/+SnHxvoOxo3d28TrmW5S1pF8DAM0jWXFVSJ/YS1b3zNy 2bRh7eptf9Od59jslvdRnAxcwOiCVeU7m8mlBLVJdfoMpulpuKs0Nw+Dv1s7r5TXHupf 5WQg== 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=ndYT0XuZo7IqMVHh34Ilwc9VmrZ75HdT+mqADRjX2MI=; b=Lv10BaS9FfEX3ciNZo61UWXI+UhuWJmnowUSYjAkXLoWucIwh36pmGb+qD2RoFQboU 6Ba2Vw1oaooD3VXFyQNO2eYyCXQLR0FzFU0f0DqdQIChAVMGn7GzpICgNlyCAUlbWBqU JW/LAKuP+vsCLOTOTDypwWN5+/E0X34/uwliTirzdzpx6O94UUg5AjBlBi4d19iFnIl0 Yo7TrtxyqsGvigiIElC5GmDQljtUONl0HII23Vm3dlJqgq4A/I07p9TJpZcwSKJ0Edyq +1BX2YGWH05am+Mq+N6wbona0xcrf7Bwz5lOJYOd5Q02m+61CxKXjVOWnyiFcRmJRlXB tOZw== X-Gm-Message-State: ALQs6tAUD8nYl2Cda6EombuGMeX1yynWV2Hlayhuwtu6t5fbg8YU7/Zb o7DQr2sUshy9Gwy4ql5uCSGW9g== X-Received: by 10.28.225.86 with SMTP id y83mr9278736wmg.92.1525355095293; Thu, 03 May 2018 06:44:55 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id k79sm18304604wmg.39.2018.05.03.06.44.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 06:44:54 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 May 2018 15:44:43 +0200 Message-Id: <20180503134444.26738-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180503134444.26738-1-onemda@gmail.com> References: <20180503134444.26738-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/vf_edgedetect: add planes option 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 | 4 +++- libavfilter/vf_edgedetect.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 29b5a5b15f..245326154c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8272,8 +8272,10 @@ Mix the colors to create a paint/cartoon effect. @item canny Apply Canny edge detector on all selected planes. @end table - Default value is @var{wires}. + +@item planes +Select planes for filtering. By default all available planes are filtered. @end table @subsection Examples diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c index 534a302d90..6f86115d23 100644 --- a/libavfilter/vf_edgedetect.c +++ b/libavfilter/vf_edgedetect.c @@ -26,12 +26,21 @@ */ #include "libavutil/avassert.h" +#include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "avfilter.h" #include "formats.h" #include "internal.h" #include "video.h" +#define PLANE_R 0x4 +#define PLANE_G 0x1 +#define PLANE_B 0x2 +#define PLANE_Y 0x1 +#define PLANE_U 0x2 +#define PLANE_V 0x4 +#define PLANE_A 0x8 + enum FilterMode { MODE_WIRES, MODE_COLORMIX, @@ -48,6 +57,7 @@ struct plane_info { typedef struct EdgeDetectContext { const AVClass *class; struct plane_info planes[3]; + int filter_planes; int nb_planes; double low, high; uint8_t low_u8, high_u8; @@ -63,6 +73,13 @@ static const AVOption edgedetect_options[] = { { "wires", "white/gray wires on black", 0, AV_OPT_TYPE_CONST, {.i64=MODE_WIRES}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "colormix", "mix colors", 0, AV_OPT_TYPE_CONST, {.i64=MODE_COLORMIX}, INT_MIN, INT_MAX, FLAGS, "mode" }, { "canny", "detect edges on planes", 0, AV_OPT_TYPE_CONST, {.i64=MODE_CANNY}, INT_MIN, INT_MAX, FLAGS, "mode" }, + { "planes", "set planes to filter", OFFSET(filter_planes), AV_OPT_TYPE_FLAGS, {.i64=7}, 1, 0x7, FLAGS, "flags" }, + { "y", "filter luma plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_Y}, 0, 0, FLAGS, "flags"}, + { "u", "filter u plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_U}, 0, 0, FLAGS, "flags"}, + { "v", "filter v plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_V}, 0, 0, FLAGS, "flags"}, + { "r", "filter red plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_R}, 0, 0, FLAGS, "flags"}, + { "g", "filter green plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_G}, 0, 0, FLAGS, "flags"}, + { "b", "filter blue plane", 0, AV_OPT_TYPE_CONST, {.i64=PLANE_B}, 0, 0, FLAGS, "flags"}, { NULL } }; @@ -322,6 +339,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) uint16_t *gradients = plane->gradients; int8_t *directions = plane->directions; + if (!((1 << p) & edgedetect->filter_planes)) { + if (!direct) + av_image_copy_plane(out->data[p], out->linesize[p], + in->data[p], in->linesize[p], + inlink->w, inlink->h); + continue; + } + /* gaussian filter to reduce noise */ gaussian_blur(ctx, inlink->w, inlink->h, tmpbuf, inlink->w,