From patchwork Tue Oct 9 12:32:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Molkentin X-Patchwork-Id: 10558 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp4843320uaq; Tue, 9 Oct 2018 05:33:59 -0700 (PDT) X-Google-Smtp-Source: ACcGV63QdHj8Jh77nGugeM1probhDGxPYuB3bRipipofFlbNHjo/9aICzzew62tyKvc8NcdZsHSr X-Received: by 2002:adf:f4c3:: with SMTP id h3-v6mr14330338wrp.259.1539088439566; Tue, 09 Oct 2018 05:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539088439; cv=none; d=google.com; s=arc-20160816; b=S2NhX4Twgvj+meqfQXF3ceyj/b+6dt9GbPyFcJlZkbqs4QYlxPvdP6fhHyKd0UDhp2 ploBbrMClp8ex8hVKqJfMbRl38hQAXtbL9iksUNRNP3/Q9oXsbpfunMgU0ZAinVB08Ll hzAqg3ayNdXEqa7+gNt0EtpjBdBfYfurctbe6UWeeDklAnaXKAHt5AMDu6+HxSFoZkbm uU23TJw/CG50fHa6EArf7/oxbQyYZpEvxKuXmxKvg3Gp00EtGVb2RRCOr9EqNH8geb6/ G3eqp2IX8wfmGo+NQuAi1rMfe0unGEmJgpzA07QtdcrNgvp3sD7bbzlifiW1R78Bovh6 +Tkg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=kskQbja7sIOH3DVOHR6ilknrmUsJIpwYyRmAbdcQuEs=; b=AHCwwQyjipMDWvGEDS8SJcrlesvGp/hYtL5xko6wqgQQnCepmPWJrC0ueYb90AJfQl Lo4rVTU3i8BubEuNJp4Zk7q1e0FKbdyolojRZPjDzjCH2Y+ULWYu4hAlDi9Pl8qKIg9g Uf9D6XNgtyTsisbHx1bjwRfrh004A4rhSZVgBnacbJeAJpznyJ43qnPUOttTVxgmMNkr CtIiPc8PgBGIcqdyjeKXrxZ6T/QbDCZmb8lsoPurcf3NSD0+4czr7xL3g6UAaZzQiAkL 2PmoQX/Vxz2OL0GNA1GXXOXArYDPw8EnT4I1MJdJQB9bNaQTXo29DodBLvigFQXX09h8 apzw== ARC-Authentication-Results: i=1; mx.google.com; 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 r7-v6si12827371wrl.213.2018.10.09.05.33.59; Tue, 09 Oct 2018 05:33:59 -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; 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 3A9EC68A1DB; Tue, 9 Oct 2018 15:33:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.molkentin.net (mail.molkentin.net [138.201.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2886868A190 for ; Tue, 9 Oct 2018 15:33:00 +0300 (EEST) Received: from localhost (localhost4.localdomain4 [127.0.0.1]) by mail.molkentin.net (Postfix) with ESMTP id 04B86DE439; Tue, 9 Oct 2018 14:33:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at example.com Received: from mail.molkentin.net ([127.0.0.1]) by localhost (mail.molkentin.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PXtVTpKNXKpb; Tue, 9 Oct 2018 14:33:20 +0200 (CEST) Received: from oldnewthing.fritz.box (ip5b40eeb3.dynamic.kabel-deutschland.de [91.64.238.179]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: daniel@molkentin.de) by mail.molkentin.net (Postfix) with ESMTPSA id 92902DD5F4; Tue, 9 Oct 2018 14:33:19 +0200 (CEST) From: Daniel Molkentin To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Oct 2018 14:32:56 +0200 Message-Id: <20181009123258.21222-5-daniel@molkentin.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009123258.21222-1-daniel@molkentin.de> References: <20181009123258.21222-1-daniel@molkentin.de> Subject: [FFmpeg-devel] [PATCH 4/6] libavfilter/ebur128: introduce target range 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: Conrad Zelck , Daniel Molkentin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This eases meeting the target level during live mixing. Signed-off-by: Daniel Molkentin Signed-off-by: Conrad Zelck --- doc/filters.texi | 3 +++ libavfilter/f_ebur128.c | 33 +++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 7f2baed9b5..3783a8a421 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -19284,6 +19284,9 @@ short-term loudness (3 seconds of analysis), and the gauge on the right is for the momentary loudness (400 milliseconds), but can optionally be configured to instead display short-term loudness (see @var{gauge}). +The green area marks a +/- 1LU target range around the target loudness +(-23LUFS by default, unless modified through @var{target}). + More information about the Loudness Recommendation EBU R128 on @url{http://tech.ebu.ch/loudness}. diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index c74dac94da..688c7bf135 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -114,6 +114,8 @@ typedef struct EBUR128Context { int meter; ///< select a EBU mode between +9 and +18 int scale_range; ///< the range of LU values according to the meter int y_zero_lu; ///< the y value (pixel position) for 0 LU + int y_opt_max; ///< the y value (pixel position) for 1 LU + int y_opt_min; ///< the y value (pixel position) for -1 LU int *y_line_ref; ///< y reference values for drawing the LU lines in the graph and the gauge /* audio */ @@ -188,22 +190,31 @@ static const AVOption ebur128_options[] = { AVFILTER_DEFINE_CLASS(ebur128); static const uint8_t graph_colors[] = { - 0xdd, 0x66, 0x66, // value above 0LU non reached - 0x66, 0x66, 0xdd, // value below 0LU non reached - 0x96, 0x33, 0x33, // value above 0LU reached - 0x33, 0x33, 0x96, // value below 0LU reached - 0xdd, 0x96, 0x96, // value above 0LU line non reached - 0x96, 0x96, 0xdd, // value below 0LU line non reached - 0xdd, 0x33, 0x33, // value above 0LU line reached - 0x33, 0x33, 0xdd, // value below 0LU line reached + 0xdd, 0x66, 0x66, // value above 1LU non reached below -1LU (impossible) + 0x66, 0x66, 0xdd, // value below 1LU non reached below -1LU + 0x96, 0x33, 0x33, // value above 1LU reached below -1LU (impossible) + 0x33, 0x33, 0x96, // value below 1LU reached below -1LU + 0xdd, 0x96, 0x96, // value above 1LU line non reached below -1LU (impossible) + 0x96, 0x96, 0xdd, // value below 1LU line non reached below -1LU + 0xdd, 0x33, 0x33, // value above 1LU line reached below -1LU (impossible) + 0x33, 0x33, 0xdd, // value below 1LU line reached below -1LU + 0xdd, 0x66, 0x66, // value above 1LU non reached above -1LU + 0x66, 0xdd, 0x66, // value below 1LU non reached above -1LU + 0x96, 0x33, 0x33, // value above 1LU reached above -1LU + 0x33, 0x96, 0x33, // value below 1LU reached above -1LU + 0xdd, 0x96, 0x96, // value above 1LU line non reached above -1LU + 0x96, 0xdd, 0x96, // value below 1LU line non reached above -1LU + 0xdd, 0x33, 0x33, // value above 1LU line reached above -1LU + 0x33, 0xdd, 0x33, // value below 1LU line reached above -1LU }; static const uint8_t *get_graph_color(const EBUR128Context *ebur128, int v, int y) { - const int below0 = y > ebur128->y_zero_lu; + const int above_opt_max = y > ebur128->y_opt_max; + const int below_opt_min = y < ebur128->y_opt_min; const int reached = y >= v; const int line = ebur128->y_line_ref[y] || y == ebur128->y_zero_lu; - const int colorid = 4*line + 2*reached + below0; + const int colorid = 8*below_opt_min+ 4*line + 2*reached + above_opt_max; return graph_colors + 3*colorid; } @@ -337,6 +348,8 @@ static int config_video_output(AVFilterLink *outlink) /* draw graph */ ebur128->y_zero_lu = lu_to_y(ebur128, 0); + ebur128->y_opt_max = lu_to_y(ebur128, 1); + ebur128->y_opt_min = lu_to_y(ebur128, -1); p = outpicref->data[0] + ebur128->graph.y * outpicref->linesize[0] + ebur128->graph.x * 3; for (y = 0; y < ebur128->graph.h; y++) {