From patchwork Thu Apr 9 11:07:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18793 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 EAAD744AD15 for ; Thu, 9 Apr 2020 14:07:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D6E5D68B7ED; Thu, 9 Apr 2020 14:07:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCAE468B703 for ; Thu, 9 Apr 2020 14:07:30 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id c12so3726513plz.2 for ; Thu, 09 Apr 2020 04:07:30 -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=MyTQYm6JAJWmo7earCEJ7Jipg0H3nW6oTe4Tv2bsYWE=; b=mY+ThqOt7YiznyAoiWx+Y4nnGphpDO6BHeUokqa4fNHS6xGvjSLezLhJsLc4JGMIOf cGleX0UCVLm9z15a7FY+wD5WrSJm1m6okigKAzD93Jbl/L7XNMkZJqjTS3gOkl6/MbJD BHAh9cTrjmI1AuNKkqnOp5J1M2GSTiT9hWmBXm3nOQXl0fBL3BcbZl89V3IvaqSD828C 2K5MzXx+VY1G1zIdVGId0ANLN4DsApv3SJUHxMSu3GDyZ2Fr3hSHPLaXN9+eKKO/QgnV lLBGvyv8csQIrfoouBEiYXHFI3VeQLyxdIo3l4yYKN6nBsnb8xbRjfgilkSe6keh8wvi qymQ== 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=MyTQYm6JAJWmo7earCEJ7Jipg0H3nW6oTe4Tv2bsYWE=; b=CXjyuzYRTbTLdylP8P5+FU3Mwm904R/NFdyqnDffHrE8rl4ECFsmAKO+sr94jMsfTJ Kty6FZLJUQw7W6mVb3VKZkcMQ9+IL71VUYVEJfalMX8fYCaEDIar/MRyPz6+0S4QEJEy XqlzyTpkb8fXbeQMwmRvBSWXRDFNNNSA1W49AMqmmTGFR0VKknu7aCHeuY6qgaAfWzKx sUJfbkWzg37SMMUgYdWa/p9TJbU2fZjmOZGc6R48u2S1mRfGX+vTOxwskXMgybLev/sa TdoVA9wGaPkB8uUWfkg/oATDt68yQSvhMCezE614Xc6Fi+lkGtBjAKcdZIYr6nZz2Sct Ae1g== X-Gm-Message-State: AGi0PubWVfdFxCufWx7eAEKNhD/cFgaNKT1vrLhHGLqTdbeTHQHa1Ifs Uk/+Q+cglMzs7qAukvmj6Ryaz+VZ X-Google-Smtp-Source: APiQypKwjHXZTjujCuK5BWX/0gOjAaO5Wu/lAkCFNWaPRBT/xZc81z3Q6McfmpxkSKcMdFFQiyIDqg== X-Received: by 2002:a17:902:322:: with SMTP id 31mr11702761pld.103.1586430449057; Thu, 09 Apr 2020 04:07:29 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id k17sm18977042pfp.194.2020.04.09.04.07.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2020 04:07:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Apr 2020 19:07:19 +0800 Message-Id: <20200409110720.6965-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200409110720.6965-1-lance.lmwang@gmail.com> References: <20200409110720.6965-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/4] avfilter/af_loudnorm: Add support for two pass stats for measure 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 Signed-off-by: Limin Wang --- libavfilter/af_loudnorm.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c index 3012aa2471..380d0570d4 100644 --- a/libavfilter/af_loudnorm.c +++ b/libavfilter/af_loudnorm.c @@ -96,6 +96,7 @@ typedef struct LoudNormContext { int above_threshold; int prev_nb_samples; int channels; + int pass; FFEBUR128State *r128_in; FFEBUR128State *r128_out; @@ -128,6 +129,7 @@ static const AVOption loudnorm_options[] = { { "compact", 0, 0, AV_OPT_TYPE_CONST, {.i64 = COMPACT}, 0, 0, FLAGS, "print_format" }, { "file", "set file path for the measured stats", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, FLAGS }, { "f", "set file path for the measured stats", OFFSET(filename), AV_OPT_TYPE_STRING, {.str=NULL}, FLAGS }, + { "pass", "enable two pass stats for measure", OFFSET(pass), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, FLAGS }, { NULL } }; @@ -833,11 +835,42 @@ static av_cold int init(AVFilterContext *ctx) } if (s->print_format != NONE && s->filename) { + if (s->pass == 1 && s->print_format != COMPACT) { + av_log(ctx, AV_LOG_ERROR, "first pass must be in compact format\n"); + return AVERROR_INVALIDDATA; + } s->print = print_file; } else { s->print = print_log; } + /* load first pass stats for second pass*/ + if (s->filename && s->pass == 2) { + char buf[1024] = { 0 }; + FILE *f = av_fopen_utf8(s->filename, "r"); + if (!f) { + av_log(ctx, AV_LOG_ERROR, "Could not open %s\n", s->filename); + return AVERROR_INVALIDDATA; + } + + if (fgets(buf, sizeof(buf)-1, f)) { + if (sscanf(buf, "input_i: %lf, input_tp: %lf, input_lra: %lf, input_thresh: %lf, target_offset: %lf\n", + &s->measured_i, &s->measured_lra, &s->measured_tp, &s->measured_thresh, + &s->offset) != 5) { + av_log(ctx, AV_LOG_ERROR, "Invalid first pass stats file(%s) for parse\n", s->filename); + return AVERROR_INVALIDDATA; + } + av_log(ctx, AV_LOG_INFO, "load first pass stats: measured_i %.2f, measured_lra: %.2f, " + "measured_tp: %.2f, measured_thresh: %.2f, target_offset: %.2f\n", + s->measured_i, s->measured_lra, s->measured_tp, s->measured_thresh, s->offset); + } else { + av_log(ctx, AV_LOG_ERROR, "Invalid first pass stats file(%s) for parse\n", s->filename); + return AVERROR_INVALIDDATA; + } + + fclose(f); + } + if (s->filename) { int ret = avio_open(&s->pb, s->filename, AVIO_FLAG_WRITE); if (ret < 0) { @@ -912,7 +945,13 @@ static av_cold void uninit(AVFilterContext *ctx) break; case COMPACT: - s->print(ctx, "input_i: %.2f, input_tp: %.2f, input_lra: %.2f, input_thresh: %.2f, " + if (s->pass == 1) + s->print(ctx, "input_i: %.2f, input_tp: %.2f, input_lra: %.2f, input_thresh: %.2f, " + "target_offset: %.2f \n", + i_in, 20. * log10(tp_in), lra_in, thresh_in, + s->target_i - i_out); + else + s->print(ctx, "input_i: %.2f, input_tp: %.2f, input_lra: %.2f, input_thresh: %.2f, " "output_i: %.2f, output_tp: %.2f, output_lra: %.2f, output_thresh: %.2f, " "normalization_type: %s, target_offset: %.2f\n", i_in, 20. * log10(tp_in), lra_in, thresh_in,