From patchwork Mon Feb 19 13:15:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaullier Nicolas X-Patchwork-Id: 7651 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp1506904jai; Mon, 19 Feb 2018 05:15:52 -0800 (PST) X-Google-Smtp-Source: AH8x226MQLregA+emau7CnqgSpBMdX1Sq1lyxxpGoEdXlj5k6AKnZIaPkqx7S4e0eh2PKcUuJsjT X-Received: by 10.28.128.137 with SMTP id b131mr10738510wmd.121.1519046152749; Mon, 19 Feb 2018 05:15:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519046152; cv=none; d=google.com; s=arc-20160816; b=tS/91fiVn1gih8nhzKGlu/ftr0ENJt0E8j1hhKmqmqOgApRFnWiHSQPr8TlJkGQThs vLArnX1rc2c+a/ypcnmxSAPpEluRp/0tZ/lWZL+h0mdzS/jSRoHL23DmiAGo2UJfy/KL qd7JnD8bQqpRzPSWdGNpN6BajdKvyx9GwF17r675bBQelQ8SPjgJeUb5rXrv1nujnz08 i3Q7wqYivMlzfESmuuq3MJzaVHRsX2aaWIidblYXXqq9v8SnjDBtfYmuXZcw/WgUvqr7 bf/r3xKhRWS3/nParxrVb9QErAkh1zo3yO4jpwtcUer6rC1SmVinKRq0xfMzJq2BG2b5 RjZQ== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=m2Wf0nmanfNDd1V22oLPV/OMMhaOl96SYBZ03enBa+k=; b=ip5Y1TbsIWlea3HBgjTG3DKH+n9u7/rQxDP/921hPy9JACsGI8MnRg3SVclxR0qKQO /mXDQUgxYn7hvUmBledSyphTodilKj243Mu1rSwRqCUfZyIjc9NobnLPiYJxhBTWc5Dc XQeukxVX4x4ZwUWCD11CD4WiX/ovH0TR0QuHEnVUmuO2Dfvvh5AGL6l414BzcgTTDeKd 09jHNSNGKjwpGl+sOWLuYIP/Ri7e90004homFNK0kgXofgIbO+O7IT9sVGnZAScvFkKP bGosj3T/+BpOIhTVOcJFMnt3PbOmodOVBR3oTAWumUt18UHg/ueP5lLoyAfkG/xLk6NE 78nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@arkena.com header.s=20150421 header.b=lxrinZWG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a12si9730436wrf.29.2018.02.19.05.15.52; Mon, 19 Feb 2018 05:15:52 -0800 (PST) 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=@arkena.com header.s=20150421 header.b=lxrinZWG; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 122A068A08D; Mon, 19 Feb 2018 15:15:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-1.arkena.net (smtp-1.arkena.net [95.81.173.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD6C1689E87 for ; Mon, 19 Feb 2018 15:15:43 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-1.arkena.net (Postfix) with ESMTPSA id 3zlPPr1HPBzMcZ6; Mon, 19 Feb 2018 13:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arkena.com; s=20150421; t=1519046144; bh=E8y2VfqTHjkoY0+aYdH6Ywi+vt6PyB/ufnJOyutbUuE=; h=From:To:Cc:Subject:Date:Message-Id; b=lxrinZWGOjNq9UOKdP3DJIMW3ddBeoxsMUvAM+6rgaI0mTqOxh42tlyyatPV1L7yS SxlF1XZvsnStu+d+/V1LeM3Vz5+fErSJ8RnZyI+q3V4yQpOL4qteBmfm8OGYxCZeKz kSF38H4QHeL9GgM8SmPrqhjhSpc4acQq1kETqzxE= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 230B93FA71; Mon, 19 Feb 2018 16:05:32 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2018 14:15:42 +0100 Message-Id: <20180219131542.8788-1-nicolas.gaullier@arkena.com> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH v3 2/8] lavfi/silencedetect: Fix when silence_start=0 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: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 0 is a valid value for silence_start --- libavfilter/af_silencedetect.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index c53b9d9218..b4184c2486 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -39,7 +39,7 @@ typedef struct SilenceDetectContext { int mono; ///< mono mode : check each channel separately (default = check when ALL channels are silent) int independant_channels; ///< number of entries in following arrays (always 1 in mono mode) int64_t *nb_null_samples; ///< (array) current number of continuous zero samples - int64_t *start; ///< (array) if silence is detected, this value contains the time of the first zero sample + int64_t *start; ///< (array) if silence is detected, this value contains the time of the first zero sample (default/unset = INT64_MIN) int last_sample_rate; ///< last sample rate to check for sample rate changes void (*silencedetect)(struct SilenceDetectContext *s, AVFrame *insamples, @@ -76,7 +76,7 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples, { int channel = current_sample % s->independant_channels; if (is_silence) { - if (!s->start[channel]) { + if (s->start[channel] == INT64_MIN) { s->nb_null_samples[channel]++; if (s->nb_null_samples[channel] >= nb_samples_notify) { s->start[channel] = insamples->pts - (int64_t)(s->duration / av_q2d(time_base) + .5); @@ -89,7 +89,7 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples, } } } else { - if (s->start[channel]) { + if (s->start[channel] > INT64_MIN) { int64_t end_pts = insamples->pts; int64_t duration_ts = end_pts - s->start[channel]; set_meta(insamples, s->mono ? channel + 1 : 0, "silence_end", @@ -102,7 +102,8 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples, av_ts2timestr(end_pts, &time_base), av_ts2timestr(duration_ts, &time_base)); } - s->nb_null_samples[channel] = s->start[channel] = 0; + s->nb_null_samples[channel] = 0; + s->start[channel] = INT64_MIN; } } @@ -129,14 +130,17 @@ static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; SilenceDetectContext *s = ctx->priv; + int c; s->independant_channels = s->mono ? inlink->channels : 1; s->nb_null_samples = av_mallocz_array(sizeof(*s->nb_null_samples), s->independant_channels); if (!s->nb_null_samples) return AVERROR(ENOMEM); - s->start = av_mallocz_array(sizeof(*s->start), s->independant_channels); + s->start = av_malloc_array(sizeof(*s->start), s->independant_channels); if (!s->start) return AVERROR(ENOMEM); + for (c = 0; c < s->independant_channels; c++) + s->start[c] = INT64_MIN; switch (inlink->format) { case AV_SAMPLE_FMT_DBL: s->silencedetect = silencedetect_dbl; break;