From patchwork Wed Jul 25 15:46:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 9790 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp957905jad; Wed, 25 Jul 2018 08:46:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdZJoDgh/OhXxZ8V1mqAqEc7xvtAKVp+VcreVW/gtAXduwO/uMrWn+DiEmb6Dawr5IpNMyY X-Received: by 2002:adf:ff11:: with SMTP id k17-v6mr14655093wrr.255.1532533614860; Wed, 25 Jul 2018 08:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532533614; cv=none; d=google.com; s=arc-20160816; b=zakmPHjpn0MiUGqbzloYq6dZhJv4gk1+HJSxV2XLvApmM2/ZAYMZtTI0xI9s27f4EJ 8BDNHv7j60wkpWILhsYJ8rMhua9N99Qta9FMdGPmZ/dyvZgb7IRAC3E8KcXHDFn/WxNY idMur9AI+PVZNRdXX2dsRymihLk3HhdQB9MXkvohxaZu9+b4MoTxW/Mu7JOPI7Ch5Xhe 36+laUEnhYS1Giuw/MGOaRJ+42IYauzEC16/XCCy4ldmmoPkeKIaLRbs9acTqNOutr1o zgDp0I9T60NIk4e5YbQ/n0Y+T3W53L3IW1Z+8/QSU5Dt20Hc79Sp0Mv0ECO8jG2xA5sD SBKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=UqELztFlh9Ea5lPqIzQdtKsH0+l1ytW0PhHQ0BVR4jE=; b=wMQdUSZ/KnO/L7V5DFd0LHBlDKOUolIa4jjcHc7KmvlFxFu8b0be9LiepUEvdz3BTW kHU7QJwHVWWrBmVpYuzPp2GHiWYYgRCFyf24IBnoyGN0Hafo5qdYQe/GlR79xeP9qY7r 5EOStTPgxnuNsT3yv/WTNzvchnMszCvouvJMHiP8SVAcvv5SMynMJuauaWNcoky2Seti 3GCcNWIhAbhvppsyQdinR4+oBOnC6KWPVZ9At0e6pckWYoeHGWJjRAAVR+qOOW3Zqa/o ble2qAImGvGT4C71/lSIHiEoaOj3MA5FgPZzSMtcR+oaNq+VJXqku7yADMW/9ZdFoDjI Gu1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d7sZb09w; 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 f187-v6si3366267wma.118.2018.07.25.08.46.54; Wed, 25 Jul 2018 08:46:54 -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=20161025 header.b=d7sZb09w; 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 E255068A3E2; Wed, 25 Jul 2018 18:46:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f176.google.com (mail-qt0-f176.google.com [209.85.216.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EC8568A30E for ; Wed, 25 Jul 2018 18:46:32 +0300 (EEST) Received: by mail-qt0-f176.google.com with SMTP id b15-v6so8065398qtp.11 for ; Wed, 25 Jul 2018 08:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=DtLPdRxcxTrEkHansHMeLE6O5g9+zfoDOLFEBv4K9Xs=; b=d7sZb09wYRlgHyc0NvxedFrQoOpUozaufj9dOaA8rfR6NUbyy0m3n3Iod1kcn0oJBp +xWcADtadKD0M8dZNE/2Ho5dvWbO8YBso+5VAFYaVjQjrKTvhBJt54f/o7y+MrAp1PtI BB6Jkm0vqpBgNNvaw5idndu9GTY/OlGJD1PTYyI8cA8CUxXs4hiHS1+0DezT8CxSCjUo 9Ph/5HgA4Nb5FrPEtpRmLci4tEpJtmCKdas7hBfxRg99QCi3yTjyL19wG6VRWOZDP/7v 3uZP2bs5AWRJwf/VBzrNHcziNByDQW2Wxk40CaKJSW9kPuITgSS5Gc6AMDGNg1MLA4gt Lkng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=DtLPdRxcxTrEkHansHMeLE6O5g9+zfoDOLFEBv4K9Xs=; b=MqbettxeMpcHSJIzW8WaD8xtU6ls8Oj0Wd7cpfwykZaZlWDUNroozQnpmT70QPZot5 FBwBWtQ3CTPRutZZ0gy3vta9yOpk8OZZTRVjy4pebWys+/3wjNcjIyKBwPQBTEZU07He 571yxlTZXwdNaKW/AGR91/G+kl2aGjtbWB8GRplaM7q/Nx+m0CRoFj7Mrg0o3o8GABGR /Qk8iVAXs7wo9OXfDPK5XOOFiimGNMpEg6Y78xJ+a1Lnv0bXR4MCx6PnV+orldAcfykd zeLtc9LNR8x+WeGemBt4ZQJX8+mTCxr7cE3iH6XFHHLNzfzXbFci6VnsFFHhxNCVHM+y zLqQ== X-Gm-Message-State: AOUpUlGbWKx+0oTk7IxKYx00zpHF9isPNWAI+hHA8+7Crj+HHKqx0F+7 DMIio1byEwX36DyTzJVnkgovjFgj X-Received: by 2002:ac8:2d58:: with SMTP id o24-v6mr19404023qta.87.1532533605541; Wed, 25 Jul 2018 08:46:45 -0700 (PDT) Received: from vimacnew.vimeo.iac.corp (mi-18-10-107.service.infuturo.it. [151.18.10.107]) by smtp.gmail.com with ESMTPSA id l22-v6sm14928196qkh.72.2018.07.25.08.46.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 08:46:44 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Jul 2018 17:46:37 +0200 Message-Id: <20180725154640.89762-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] vf_tonemap: Update the default peak values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When there is no metadata attached to a frame, take into account both the PQ and HLG transfers, and change the HLG default value to 10: the value of 12 is the maximum range in scene referred light, but the reference OOTF maps this from 0 to 1000 cd/m² on the ideal HLG monitor. This matches what vf_tonemap_opencl does. --- libavfilter/vf_tonemap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index 10308bdb16..10fd7ea016 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -131,10 +131,10 @@ 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 */ + // For untagged source, use peak of 10000 if SMPTE ST.2084 + // otherwise assume HLG with reference display peak 1000. if (!peak) - peak = 12; + peak = in->color_trc == AVCOL_TRC_SMPTE2084 ? 100.0f : 10.0f; return peak; }