From patchwork Tue Oct 8 11:28:42 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: 15568 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 13EFA44A445 for ; Tue, 8 Oct 2019 14:29:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05407688163; Tue, 8 Oct 2019 14:29:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6214E688157 for ; Tue, 8 Oct 2019 14:29:02 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id b9so19006803wrs.0 for ; Tue, 08 Oct 2019 04:29:02 -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=1GZ/y30mQV6cHI8JKq68y9TOWnKV/t5LaVeiEJ7BSe8=; b=FebPGTBidIx9gUDqM65DKc2ZiwrRLw4f0DsoEF6wpJXUQEFbmVCvKWjQdWv8I3lkdh G3I/DAFVRaud+td3TLnVSWbkfv/jBJAqCA7X60vwXYaxoH6EJLgPg4Mzvu0cJbkFbsZ4 h82UBPgarizqQry07gc/d3b1nptFgWWM2vccNZ+szwVjL/x0If4iBBLx400sdTTCMoBw 1EiRzW5H7he3cVrZf2U+Dstoomhm5xYJibgJ0Rs7HXEs7fgtYooju48Z0qjcnzi1vD6j jyPmlpn6TZuajtOyJmTG9tEDOKYGIg1/Af9HgosOvQL/qFrj94OdXD2uDw4Kqd49eRAX XB6A== 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=1GZ/y30mQV6cHI8JKq68y9TOWnKV/t5LaVeiEJ7BSe8=; b=P94WYfqylvYGmPU9PJgArho6ZhNXZ76ueJKUM7WvEuXZdrBT2JR3LS+SW0UDVR07o3 w0fV1DjkG6WJeMnel8wWg+acKEgorDs/cHOct1pHyVMujRQj97/sAReCcDPpRdewn4iF ROfGg6InQjUi5Jq5hCfgaBqwzaYaUzxOqVEa1wm5XO89g814mpFe+ah7y6qKa/kEQk9r CALFl6XbaIL/n8hKM4jfzWq7xOBZKS+slgnM5Il+y7VBV0nVIC8K0aS8ptGJZSHm+t6P SjXnUhUPRjnGYLELmoPcjUr4hEf1LnXnlHTAoILa56UxItxLVGDZb8VmmsLdv8Ks5f2V 2U5w== X-Gm-Message-State: APjAAAXqfLQ41reEAIvH+9/MOw39++3mSzeNRiEUYWADbPddx6p79Rmk 15R5RNoYsh5DOD186OzNyNCMoNdC X-Google-Smtp-Source: APXvYqzSy/WYwovoFDjb1DALQAlQaIAP3Dt2U+s7AY2rcWCjLsJkMSQey/G1VKRHzgnpSI32U9+g8Q== X-Received: by 2002:adf:eecf:: with SMTP id a15mr19315967wrp.9.1570534141768; Tue, 08 Oct 2019 04:29:01 -0700 (PDT) Received: from localhost.localdomain ([109.227.61.240]) by smtp.gmail.com with ESMTPSA id r2sm17198024wrm.3.2019.10.08.04.29.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2019 04:29:01 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 13:28:42 +0200 Message-Id: <20191008112843.6875-7-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191008112843.6875-1-onemda@gmail.com> References: <20191008112843.6875-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 7/8] avfilter/af_anlmdn: switch to ff_filter_process_command() 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 --- libavfilter/af_anlmdn.c | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/libavfilter/af_anlmdn.c b/libavfilter/af_anlmdn.c index b5bc94b4eb..8125005114 100644 --- a/libavfilter/af_anlmdn.c +++ b/libavfilter/af_anlmdn.c @@ -73,15 +73,16 @@ enum OutModes { #define OFFSET(x) offsetof(AudioNLMeansContext, x) #define AF AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM +#define AFC AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_COMMAND_PARAM static const AVOption anlmdn_options[] = { - { "s", "set denoising strength", OFFSET(a), AV_OPT_TYPE_FLOAT, {.dbl=0.00001},0.00001, 10, AF }, + { "s", "set denoising strength", OFFSET(a), AV_OPT_TYPE_FLOAT, {.dbl=0.00001},0.00001, 10, AFC }, { "p", "set patch duration", OFFSET(pd), AV_OPT_TYPE_DURATION, {.i64=2000}, 1000, 100000, AF }, { "r", "set research duration", OFFSET(rd), AV_OPT_TYPE_DURATION, {.i64=6000}, 2000, 300000, AF }, - { "o", "set output mode", OFFSET(om), AV_OPT_TYPE_INT, {.i64=OUT_MODE}, 0, NB_MODES-1, AF, "mode" }, - { "i", "input", 0, AV_OPT_TYPE_CONST, {.i64=IN_MODE}, 0, 0, AF, "mode" }, - { "o", "output", 0, AV_OPT_TYPE_CONST, {.i64=OUT_MODE}, 0, 0, AF, "mode" }, - { "n", "noise", 0, AV_OPT_TYPE_CONST, {.i64=NOISE_MODE},0, 0, AF, "mode" }, + { "o", "set output mode", OFFSET(om), AV_OPT_TYPE_INT, {.i64=OUT_MODE}, 0, NB_MODES-1, AFC, "mode" }, + { "i", "input", 0, AV_OPT_TYPE_CONST, {.i64=IN_MODE}, 0, 0, AFC, "mode" }, + { "o", "output", 0, AV_OPT_TYPE_CONST, {.i64=OUT_MODE}, 0, 0, AFC, "mode" }, + { "n", "noise", 0, AV_OPT_TYPE_CONST, {.i64=NOISE_MODE},0, 0, AFC, "mode" }, { "m", "set smooth factor", OFFSET(m), AV_OPT_TYPE_FLOAT, {.dbl=11.}, 1, 15, AF }, { NULL } }; @@ -339,29 +340,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->cache); } -static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, - char *res, int res_len, int flags) -{ - AudioNLMeansContext *s = ctx->priv; - - if (!strcmp(cmd, "s")) { - float a; - - if (av_sscanf(args, "%f", &a) == 1) - s->a = av_clipf(a, 0.00001, 10); - } else if (!strcmp(cmd, "o")) { - if (!strcmp(args, "i")) { - s->om = IN_MODE; - } else if (!strcmp(args, "o")) { - s->om = OUT_MODE; - } else if (!strcmp(args, "n")) { - s->om = NOISE_MODE; - } - } - - return 0; -} - static const AVFilterPad inputs[] = { { .name = "default", @@ -390,7 +368,7 @@ AVFilter ff_af_anlmdn = { .uninit = uninit, .inputs = inputs, .outputs = outputs, - .process_command = process_command, + .process_command = ff_filter_process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, };