From patchwork Mon May 21 06:58:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruiling Song X-Patchwork-Id: 9033 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp8015409jad; Sun, 20 May 2018 23:58:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrPLGl6afYJ8wApKzBUv01Im/UuEosSbK4VQ6qTSGIv+fWvEvItD+umJuk+13BtcaB/OGSc X-Received: by 2002:a1c:e3d4:: with SMTP id a203-v6mr9577114wmh.151.1526885928300; Sun, 20 May 2018 23:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526885928; cv=none; d=google.com; s=arc-20160816; b=hagqydNKFZ23rH9nku7KE9mJquSHuwt3xy4n2WngPewzcOt1e0GY1acpomFcA2+5P7 4ZVtwPDu52wgELCkBTfuHw8F8iledzweO39eWPb7wFVNN708WWNOaLeWHXu9DKmATLQL 21r8To1b7HCUjNpfA37NT/CEpqLtHZZbo6xbt8626EWxOA4Ybibxyn6UjzSoz+HL9IdS zRv2sC1zqOKnpTdf5y0C72OCYm8TEcKXEeyAkhEo1FMZpiXO8dMvrTRhJgd0d3+M36OU JVD9n6CvUOshR8R3f3fpMYXNEvLRfbE2l6WF2FE1BffawMJ/79P4mpKe267tZeKyHlvc oawQ== 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:delivered-to :arc-authentication-results; bh=VHvGzPuvboDXPKrufvc3FVSwUguocrRRBtsXwlFU1t0=; b=l8vemYWZfseh7XK1X3l+wfvVM3RQ69UykFjRsB5L1iOvzusjc4COVOHXFTV9g+/7TW XIjEaV4IhEcoBSIKW/XTj+u75szE93XZ1ySnzAHJmhTCmClVkILGa6uhYe9KtlwAPJ6o 2zIVdpN9jVXWxavV87EmamScmOm/lVmKkd0FWK+okkumrrjeBAPJclX7yOtIbG6FdFyX DGpedj6P7WYiCH86XfNNtUufgYVSKP8qob0c1fhn80Hgs+7V+uDUsK2jcdq9zBCfe/1P Gt92uhom8bTViBfRZAevpC5kZzQmG6Nz8a01Uwz+IjjbRymOPh9htr1I/HblF/au4gay bH2Q== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b70-v6si9657937wme.77.2018.05.20.23.58.47; Sun, 20 May 2018 23:58:48 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5AB968A4C2; Mon, 21 May 2018 09:58:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7CB8A68A347 for ; Mon, 21 May 2018 09:57:58 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2018 23:58:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,426,1520924400"; d="scan'208";a="42567535" Received: from ocl-kbl.sh.intel.com ([10.239.160.52]) by orsmga007.jf.intel.com with ESMTP; 20 May 2018 23:58:35 -0700 From: Ruiling Song To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 May 2018 14:58:33 +0800 Message-Id: <1526885913-13260-1-git-send-email-ruiling.song@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavfi: a minor fix to tonemap peak detection. 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: vittorio.giovara@gmail.com, ffmpeg@haasn.xyz, Ruiling Song MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If the transfer was SMPTE2084, use the peak of 10000 even if not tagged. Otherwise, we would assume it is HLG with a peak of 1200. Based on suggestion by Niklas Haas. Signed-off-by: Ruiling Song --- libavfilter/vf_tonemap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 10308bd..ab45f2e 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -131,10 +131,9 @@ static double determine_signal_peak(AVFrame *in) peak = av_q2d(metadata->max_luminance) / REFERENCE_WHITE; } - /* smpte2084 needs the side data above to work correctly - * if missing, assume that the original transfer was arib-std-b67 */ + /* if not SMPTE2084, we would assume HLG */ if (!peak) - peak = 12; + peak = in->color_trc == AVCOL_TRC_SMPTE2084 ? 100 : 12; return peak; }