From patchwork Thu Oct 10 11:38:44 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: 15676 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 5A89344932D for ; Thu, 10 Oct 2019 14:39:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E996688324; Thu, 10 Oct 2019 14:39:11 +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 06C176881FD for ; Thu, 10 Oct 2019 14:39:07 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id z9so7454950wrl.11 for ; Thu, 10 Oct 2019 04:39:07 -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=IZWaJc61ec4mHj21oRso6gbw+BkSS+FQYgd/0DQiYsM=; b=aBaIoalp3VBWQNNmUG4/XNQWp+GtcnJdfshWH70vwfuAt1W8lQzEO9vmFJBvuUZHXy deaQBiEAKPUT/jbvMS6XGKt5Mb17xNszoJFu8RG/upVJBDhcEBOo8G60+5LriZgQr11i o+qTcWHQIMdyjl0MYUyu3qEoKsV3+mgwWJcYmbZ8wWNr2qSi02FMyIWJsVvjgerJUT35 /hBw4wAraTPnlQxxheuk6sLqupyc6ZZkZWaOssaM3acEDd+0Tgx+10EG6CUYDyAq8Ngr pZjaWJV0wkMkLVBM6UBRHlJteumKnsCUhKbgpcckRozmKUMX8vxTjerJoOI0n4ebjKYh VLEg== 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=IZWaJc61ec4mHj21oRso6gbw+BkSS+FQYgd/0DQiYsM=; b=jUTz5tqsLtqs3DlZSU3sD4soEY+VPy90R/4bRRS509hek2VpJ+HxgsfhGHB1aGIqLG YlyYL5bG9CS9hUJAUvd7lQZtbny5WgzezithsHNANn9bOajxyyiTYz4QXL14Gz9dqIgb lLJz6IrI9KTEmFXxx1kIcDhzA7SiWXp78eiN/6W4rPFE5WWfaOa2BTwPxch8cQ+9IWZe ph7SjM7T3ygICwDnYsluyIQENqpOURtdZC8P9eeNPg9f5rQVTzEq+LicjtAwnNDQUnTe kTR8tU1N575keWXN0Sbj6HdchtJFDB3YzGNDzDPOIFtjAhroQ9QSknkamtb4EIQmoEma zn+w== X-Gm-Message-State: APjAAAUAlEfaeb7FKCfdazIMN+vX+j/I/k6PmvhsG47SaaYYruN4k8yb SsA3ZEG8P175W20nQsrj5KwkWagn X-Google-Smtp-Source: APXvYqwLT1vPgvV+ZWib1WBdhEA/igJwrlLTIA4BSB7eoS4cQ6PWosRNHW/qUFV5FvYr0xKltj4O2Q== X-Received: by 2002:adf:df0e:: with SMTP id y14mr8534969wrl.312.1570707547214; Thu, 10 Oct 2019 04:39:07 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id w4sm5442214wrv.66.2019.10.10.04.39.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 04:39:06 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 13:38:44 +0200 Message-Id: <20191010113851.27196-7-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010113851.27196-1-onemda@gmail.com> References: <20191010113851.27196-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 07/14] 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..6e37452963 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 AFT AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_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, AFT }, { "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, AFT, "mode" }, + { "i", "input", 0, AV_OPT_TYPE_CONST, {.i64=IN_MODE}, 0, 0, AFT, "mode" }, + { "o", "output", 0, AV_OPT_TYPE_CONST, {.i64=OUT_MODE}, 0, 0, AFT, "mode" }, + { "n", "noise", 0, AV_OPT_TYPE_CONST, {.i64=NOISE_MODE},0, 0, AFT, "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, };