From patchwork Tue Oct 8 15:04:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15579 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 E4E5B44AA62 for ; Tue, 8 Oct 2019 18:05:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D008B688050; Tue, 8 Oct 2019 18:05:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF22680089 for ; Tue, 8 Oct 2019 18:05:03 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id y22so10952283pfr.3 for ; Tue, 08 Oct 2019 08:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CzKgkL8I6NTkVEJlUKlcHa7h3Tv7j9QV7yBSyhu72c0=; b=j7gqimzdPe5yetxgESKN1mQYE9WwA5nZFgqYcteU3akF1NUwQeN8B1K0RhjqnqgDET 3ns7hIeR08ck7SrndZ/5M89hDFsKawGXRgPh+gI2wVeu1/A3dLDKcClMuGGpuoEHnWuv bJpjhDPCeWyH+wXz9fuM2q49zD1CTkO/lfCK60HrvJS+KpV3NOiatt6SEsXKck1iIEi2 ljjW/44ZwofSiTjZ+9gqNKRcx9JikDNVqgZ1S/7HjND+UAbFYuzdQIWlvm5siSW42maC zaoJ5f+2V4cUGNnhVKrC0uOrgKXPDo6bKOS+Lj1HsRnUGRRSDwrwAIfuc6wzhxDk3VKk Wk8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CzKgkL8I6NTkVEJlUKlcHa7h3Tv7j9QV7yBSyhu72c0=; b=LrLgdqvAoIRO9mdQe7MTXHFRpM8inzw6G3R4CRo2upiWxBt85UpkfnukOQ3Xwq81/A 9w7UVFLaEMoa2rrZdR67hs5uDkMPnpLsOPGOz3HyIhp4pE4M4P+2ZZWLU6VzwOJYgDbj +VhcNYrlmfWacGCDO7abOfWFs82GkPwUPNa+2C70y2zKwcB/21/SW9FJApPEp13813fK juZFAZAKU+YSCL+IjQoFx8Lsy7IV6ZE18yT5pYVc04MVIqbvwOEe0AbN44teBk/CszW8 u/e4TZqEbF7lA5X+b+nKgC8OGkthqp6DHjimPyd9dGkv+zfvNwF2ew1luubdXRf2HHwb iNjQ== X-Gm-Message-State: APjAAAWv5Su2KNxhzTswQq20538nMJFusfSb7WsmugqVMmfwRkXg6KZH D3ppeD5n5eaf9Q/IJ5HM+J1YvMGV X-Google-Smtp-Source: APXvYqxVxySCPhEdXXO367OVLoNpOgK+5qhBCgRdsnD+r9qYgd4CAjH1YfAGBR2J9VtUnxuiPIAWgw== X-Received: by 2002:a17:90a:7142:: with SMTP id g2mr6359600pjs.36.1570547102002; Tue, 08 Oct 2019 08:05:02 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 127sm23533880pfy.56.2019.10.08.08.05.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 08:05:01 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 23:04:52 +0800 Message-Id: <20191008150453.30222-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008150453.30222-1-lance.lmwang@gmail.com> References: <20190930133647.6290-1-lance.lmwang@gmail.com> <20191008150453.30222-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avfilter/af_silencedetect: use AV_OPT_TYPE_DURATION 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Reviewed-by: Moritz Barsnick Signed-off-by: Limin Wang --- doc/filters.texi | 4 +++- libavfilter/af_silencedetect.c | 10 ++++++---- tests/fate/filter-video.mak | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9bd63de..45ff5d4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -4648,7 +4648,9 @@ Set noise tolerance. Can be specified in dB (in case "dB" is appended to the specified value) or amplitude ratio. Default is -60dB, or 0.001. @item duration, d -Set silence duration until notification (default is 2 seconds). +Set silence duration until notification (default is 2 seconds). See +@ref{time duration syntax,,the Time duration section in the ffmpeg-utils(1) manual,ffmpeg-utils} +for the accepted syntax. @item mono, m Process each channel separately, instead of combined. By default is disabled. diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index ed16f3d..3eb378d 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -35,7 +35,7 @@ typedef struct SilenceDetectContext { const AVClass *class; double noise; ///< noise amplitude ratio - double duration; ///< minimum duration of silence until notification + int64_t duration; ///< minimum duration of silence until notification int mono; ///< mono mode : check each channel separately (default = check when ALL channels are silent) int channels; ///< number of channels int independent_channels; ///< number of entries in following arrays (always 1 in mono mode) @@ -50,13 +50,14 @@ typedef struct SilenceDetectContext { AVRational time_base); } SilenceDetectContext; +#define MAX_DURATION (24*3600*1000000LL) #define OFFSET(x) offsetof(SilenceDetectContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_AUDIO_PARAM static const AVOption silencedetect_options[] = { { "n", "set noise tolerance", OFFSET(noise), AV_OPT_TYPE_DOUBLE, {.dbl=0.001}, 0, DBL_MAX, FLAGS }, { "noise", "set noise tolerance", OFFSET(noise), AV_OPT_TYPE_DOUBLE, {.dbl=0.001}, 0, DBL_MAX, FLAGS }, - { "d", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, {.dbl=2.}, 0, 24*60*60, FLAGS }, - { "duration", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, {.dbl=2.}, 0, 24*60*60, FLAGS }, + { "d", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=2000000}, 0, MAX_DURATION,FLAGS }, + { "duration", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=2000000}, 0, MAX_DURATION,FLAGS }, { "mono", "check each channel separately", OFFSET(mono), AV_OPT_TYPE_BOOL, {.i64=0.}, 0, 1, FLAGS }, { "m", "check each channel separately", OFFSET(mono), AV_OPT_TYPE_BOOL, {.i64=0.}, 0, 1, FLAGS }, { NULL } @@ -142,6 +143,7 @@ static int config_input(AVFilterLink *inlink) int c; s->channels = inlink->channels; + s->duration = av_rescale(s->duration, inlink->sample_rate, AV_TIME_BASE); s->independent_channels = s->mono ? s->channels : 1; s->nb_null_samples = av_mallocz_array(sizeof(*s->nb_null_samples), s->independent_channels); if (!s->nb_null_samples) @@ -174,7 +176,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) const int nb_channels = inlink->channels; const int srate = inlink->sample_rate; const int nb_samples = insamples->nb_samples * nb_channels; - const int64_t nb_samples_notify = srate * s->duration * (s->mono ? 1 : nb_channels); + const int64_t nb_samples_notify = s->duration * (s->mono ? 1 : nb_channels); int c; // scale number of null samples to the new sample rate diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 0c6ee72..dd57a40 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -747,7 +747,7 @@ fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags SILENCEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER TTA_DEMUXER TTA_DECODER SILENCEDETECT_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect fate-filter-metadata-silencedetect: SRC = $(TARGET_SAMPLES)/lossless-audio/inside.tta -fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=n=-33.5dB:d=.2" +fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=n=-33.5dB:d=0.2" EBUR128_METADATA_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER EBUR128_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(EBUR128_METADATA_DEPS)) += fate-filter-metadata-ebur128