From patchwork Mon Jun 17 11:18:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yigithan Yigit X-Patchwork-Id: 49971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1862458vqg; Mon, 17 Jun 2024 04:18:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCvTAEVYcZD+/VnAgV4fcgdm/DEh21CKCN/CAOiuW5ezfKjbcTAO9YrbvZAkvBG89ODzdFu9+3Q4xETOo9+Kpf05L0sVrMUkHmJA== X-Google-Smtp-Source: AGHT+IGAjQFaPcVyhgYlDw8lsHDFMXzkgy7W160cL7pomEabsjgcDQEHCxbj/OBTmUlr7UZPlynq X-Received: by 2002:a2e:bc0e:0:b0:2ec:ca8:4897 with SMTP id 38308e7fff4ca-2ec0e5bc7bdmr59056681fa.4.1718623135847; Mon, 17 Jun 2024 04:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718623135; cv=none; d=google.com; s=arc-20160816; b=El0qxPWfggSShNJljRMUNLjNeUNnTTwSZPymAyPcYQzkfFk+KzSB29VeaofJS05IM0 Bun5BuHNtF8R3xrn6nqk5tb1/HNdtrRzvxfL6ZpC7Dbw88Jj9DwkLYeP5bx9ROiJXmNN JLmJxD8cMLrGVAYx05KMpaFeEVfyoK2YJGtYBG0JwYSX2rmDaTCfJuH5puj5Yps1y2Sw cEbBY0V7Xx4lzggmCqVg0RCl9cj5GUGuiowtThfYYyTJf8eJOxqi0frkddjfyClVr18d xLwQ0jx0oqwycxEvMCCrzOiM299kSU4O650N4RLVsPQKa9kctEpU+w87uNAmFu6jhvmK RELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=E1mwgwodgNiwoOwRMgw7eziY8yz+8+Xc/e3iLyY9Qwc=; fh=oYrUj4vT4ivb560z23e71q/pal11/Mm+yKMO8RKszaM=; b=NZSieKdJZQM5awQJXrSPG9ir7kjdFJRv1eyn6CBjtY1h/ulI4r9b/zSVQkpbS1S2Ru AuPduzhVgAZ9tmUUxtsBsJU8ADyrRyOTE0fmWg5z6gpAnZW+RWU/PkRc78K8FMs1lleA amuZhx8Gore5bYK1MTiBSRhn/4CzobsgkHBcFtx1aHA950Xi3lY/JtCzQy8I06tkgLCC gFbnwRvC62xMboQYKSHNl96+1MFF9QYRQhnuhKAt1acYC7KxK2YQNdRaqVXPyZyC0qgN CvZ6C0p3Kx72nx0TaaISkzug5rXmDr2XOtBln7K53wutkSMudbKr7Qr7JVSStedoKfMq Zpdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Z2H9c6eO; 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 38308e7fff4ca-2ec05bc1790si25301021fa.30.2024.06.17.04.18.55; Mon, 17 Jun 2024 04:18:55 -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=20230601 header.b=Z2H9c6eO; 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 0C7B068D789; Mon, 17 Jun 2024 14:18:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CC4B68D778 for ; Mon, 17 Jun 2024 14:18:23 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2ec002caeb3so56404721fa.2 for ; Mon, 17 Jun 2024 04:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718623102; x=1719227902; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qT+/cR5XuIe0cgRWOaovGp9ucMUws0WRgUpxZc5Q2UM=; b=Z2H9c6eOFUdiS2lg8qJm8L55X5vi3uWtRu7eBM3xRYdgGX8yN95WeW95+bxd1dW/YM b2WMts7KB0T1us7OjEYhMws+xqV/G/LO7P6ImnH5tVwf0NUPD3HvNZvz/abuAUMRj9+w 258M1pRqpXnD/r4MBUARFJOHSFzBeaXx7+J9EpsNWoif3VxrSirpAOzv9yePjfW0dCq2 di7idmi2p3HrpDDlT8An1c2BOfErhWrb3vWMdnhAAYoN9auA2M+gnzl69oiy7R2SwxJ/ r4FPt8uGv5PxwUlUqiYi2vSQ+WvckK/VuRLxFaBpLRHQQ3r7pHKoaxqtz1/ESLYWGBlY VOjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718623102; x=1719227902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qT+/cR5XuIe0cgRWOaovGp9ucMUws0WRgUpxZc5Q2UM=; b=BTJjVQkiv6KOs5jWfJu3bnTsz0ygKJBYBJdFOTM22+lhphE4Pk+qw4RbG6wowt4tTQ wkHqUQgtKgYKJiqyyTytpudRLIY2qk67GDlRMl6ASfx26xtENIibYDS7LdcKDLuwEXkY 27ImuaS1rgXAZ80DmEQB+9URX0g1Mh1+dS1ykUSSvH99D901TVNlniiciz2Owj/j4vAa Xdt/MTwnox9Hf9wEUZcIXxmoMirOOl6iKN5iaG2U9Xtx8ZQVB3ywP7n2OcWiavc5NnGk fX4v3EV0nzmcucDSZb4zjk15cFnWv89sfwUEjgBc61B93RgW8eoHIOeiyaUAoS3wy7hI miaA== X-Gm-Message-State: AOJu0YzhW9ZvPuJ0WKb2fC7jRnc1/McT1ZOhiLN2in23a1mHdiD0N2y+ 4bSXvi3cQoSXzUmTpyzMDZ5IJ11oA1nWwu/tfyXej/VdsS+nvYZwjazgfA== X-Received: by 2002:a05:651c:547:b0:2ec:e98:36a8 with SMTP id 38308e7fff4ca-2ec0e983e42mr73824511fa.5.1718623102002; Mon, 17 Jun 2024 04:18:22 -0700 (PDT) Received: from localhost.localdomain ([88.239.140.156]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-422f5f33c38sm157888015e9.9.2024.06.17.04.18.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Jun 2024 04:18:21 -0700 (PDT) From: Yigithan Yigit To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 14:18:12 +0300 Message-ID: <20240617111812.84575-4-yigithanyigitdevel@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240617111812.84575-1-yigithanyigitdevel@gmail.com> References: <20240617111812.84575-1-yigithanyigitdevel@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/af_volumedetect.c: reindent after last commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: thilo.borgmann@mail.de, yigithanyigitdevel@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V+Y9ohz496fG --- libavfilter/af_volumedetect.c | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index dbbcd037a5..b78b073c09 100644 --- a/libavfilter/af_volumedetect.c +++ b/libavfilter/af_volumedetect.c @@ -134,40 +134,40 @@ static void print_stats(AVFilterContext *ctx) sum += vd->histogram[i]; } } else { - for (i = 0; i < 0x10000; i++) - nb_samples += vd->histogram[i]; - av_log(ctx, AV_LOG_INFO, "n_samples: %"PRId64"\n", nb_samples); - if (!nb_samples) - return; - - /* If nb_samples > 1<<34, there is a risk of overflow in the - multiplication or the sum: shift all histogram values to avoid that. - The total number of samples must be recomputed to avoid rounding - errors. */ - shift = av_log2(nb_samples >> 33); - for (i = 0; i < 0x10000; i++) { - nb_samples_shift += vd->histogram[i] >> shift; - power += (i - 0x8000) * (i - 0x8000) * (vd->histogram[i] >> shift); - } - if (!nb_samples_shift) - return; - power = (power + nb_samples_shift / 2) / nb_samples_shift; - av_assert0(power <= 0x8000 * 0x8000); - av_log(ctx, AV_LOG_INFO, "mean_volume: %.1f dB\n", -logdb((double)power, AV_SAMPLE_FMT_S16)); - - max_volume = 0x8000; - while (max_volume > 0 && !vd->histogram[0x8000 + max_volume] && - !vd->histogram[0x8000 - max_volume]) - max_volume--; - av_log(ctx, AV_LOG_INFO, "max_volume: %.1f dB\n", -logdb((double)(max_volume * max_volume), AV_SAMPLE_FMT_S16)); - - for (i = 0; i < 0x10000; i++) - histdb[(int)logdb((double)(i - 0x8000) * (i - 0x8000), AV_SAMPLE_FMT_S16)] += vd->histogram[i]; - for (i = 0; i <= MAX_DB && !histdb[i]; i++); - for (; i <= MAX_DB && sum < nb_samples / 1000; i++) { - av_log(ctx, AV_LOG_INFO, "histogram_%ddb: %"PRId64"\n", -i, histdb[i]); - sum += histdb[i]; - } + for (i = 0; i < 0x10000; i++) + nb_samples += vd->histogram[i]; + av_log(ctx, AV_LOG_INFO, "n_samples: %"PRId64"\n", nb_samples); + if (!nb_samples) + return; + + /* If nb_samples > 1<<34, there is a risk of overflow in the + multiplication or the sum: shift all histogram values to avoid that. + The total number of samples must be recomputed to avoid rounding + errors. */ + shift = av_log2(nb_samples >> 33); + for (i = 0; i < 0x10000; i++) { + nb_samples_shift += vd->histogram[i] >> shift; + power += (i - 0x8000) * (i - 0x8000) * (vd->histogram[i] >> shift); + } + if (!nb_samples_shift) + return; + power = (power + nb_samples_shift / 2) / nb_samples_shift; + av_assert0(power <= 0x8000 * 0x8000); + av_log(ctx, AV_LOG_INFO, "mean_volume: %.1f dB\n", -logdb((double)power, AV_SAMPLE_FMT_S16)); + + max_volume = 0x8000; + while (max_volume > 0 && !vd->histogram[0x8000 + max_volume] && + !vd->histogram[0x8000 - max_volume]) + max_volume--; + av_log(ctx, AV_LOG_INFO, "max_volume: %.1f dB\n", -logdb((double)(max_volume * max_volume), AV_SAMPLE_FMT_S16)); + + for (i = 0; i < 0x10000; i++) + histdb[(int)logdb((double)(i - 0x8000) * (i - 0x8000), AV_SAMPLE_FMT_S16)] += vd->histogram[i]; + for (i = 0; i <= MAX_DB && !histdb[i]; i++); + for (; i <= MAX_DB && sum < nb_samples / 1000; i++) { + av_log(ctx, AV_LOG_INFO, "histogram_%ddb: %"PRId64"\n", -i, histdb[i]); + sum += histdb[i]; + } } }