From patchwork Wed Jul 25 15:46:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 9792 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp963910jad; Wed, 25 Jul 2018 08:53:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdjg8zQv0SrmGtIkHazJMckCdU5Ne4Q8Eb+0ZBx/WGH8TL4OVO8Toa7GLrlW8uh+Vbcmbso X-Received: by 2002:a1c:5b09:: with SMTP id p9-v6mr5585557wmb.0.1532534021501; Wed, 25 Jul 2018 08:53:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532534021; cv=none; d=google.com; s=arc-20160816; b=xXmiPqy3tRRg1vSpaMjXTSkPjwkbIPjus0czgeAcxxB6xttaXE8NrhFj5yy7kXNPIE lBdtGc1LCyijQ+TLi8oYIbcW4BmmG7A18P8bKtUMyDZyR/bZi/01g3BOEHpxHnDiQt8C e7U5wgV+wf6+AH0GfZYxuDm2f+nQ+b82o9TirFYAvSgb6lT1Evt8xuY/HYQTL7FK/Qzj 2S0jKO3BcxvjXzZDIqFa9lpKbpdI661ZbH24t5dcUvcI/1gmz4Q1ydUywH98MiTNzH8u 64esTJsFgiqcf83lsrjMJnw4VnFXrYpLoWdg21s/xPjWhojrmpw0g0whJcDzG34u/Mnt uxgw== 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: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:dkim-signature:delivered-to:arc-authentication-results; bh=4AnrG7ih+TmMTtnWNgAw20z6c8g9T1X3nGg+VPf4PaQ=; b=OZy/Xy2HfOv/Yzmg0q3M+5zyPtp2lalyJCahrcnHWPgqmB4QIxtLP6h5yH8URmQWao g4CBoOYhpOtXUpeOo/9Ivb8rZ3ntI7ms/+N377C5IDACq4rLgWkb3EKSR/KR+UAHLs81 TxSpQ61X/nAjwVDs5cxDu2XFhcPW67vSZGZMVChDzW3bnbBfI3KqQZjXyieRx3qhEIqO 2/8av/fwrN12085hraiviDXR/5RCcO16bpiv10AdqNAVaHHvA9Ts0E5NoroUVFcD/k0p 7c8XZiv4CwtvDJAnG8ZDTG1HeOglPokSvf6GH9rD0Ww6RyNoIzr/8nTQfVXyRcfV46hg Wm4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mQ+zo3X1; 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 d2-v6si11669336wrd.300.2018.07.25.08.53.41; Wed, 25 Jul 2018 08:53:41 -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=mQ+zo3X1; 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 9FE2B68A3EF; Wed, 25 Jul 2018 18:53:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22D6968A3EF for ; Wed, 25 Jul 2018 18:53:19 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id z8-v6so8098385qto.9 for ; Wed, 25 Jul 2018 08:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=m2ZZnzrMoEf6D2Twj+RvN1k9UQQFi1sp3qnN5jJmkdY=; b=mQ+zo3X1+GtZXgb/SS84yUIJcQjy45riRekLXn8S0X6mhiFN2BTY+KT7WiEiR0E9/7 R1O5PxGmsGikwAm4FRroT+475RekspQIWd44n5cTmkB1lg4tgrryr0+vcrLjDvhZ6ZDS sETmdv6u+zMt6Te25hlR/eTxwMkDCVEXalDkbvahYZwzS/VGLRqwkagunFoPXUXUirFx JjtXxoRJom09m8Z8vgFPJ86e/gqdNeIaOAygvwqfkGFsWLDvq4/n5glPmZLP3tfKPGxA QOAckt0wZ8PqHgPlIYXpv0wUBDFbovotgbP5jyWejFEKLc2QXyvgyKRRZ6yqUK3lO1Kv HbTw== 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:in-reply-to :references; bh=m2ZZnzrMoEf6D2Twj+RvN1k9UQQFi1sp3qnN5jJmkdY=; b=KFqGAXtGOYYqhFGcx5vhfepRyKVlDcf+X4GDtTxPt21F8SQWLGu2ZEUMyvr4jnkL9L A95EBJVsrzInRTK32ykDAsBruvIcXUMMGhgU5Xn/2EW0xObByjyG0RI70EK/024+T585 +2Ty8A8bLWjLeTp44Lcz1j6HX+SeZWNfdwe9xc23l4ZvmESEtHIBAQg9P2hnV8eV1W8H jie9HnZlPKcpnaNKiK5T7aq6sEYdFdJGkTqAuvfKoEzTVyynEDVoX7gbqfaH9/KKhH2/ RSxbZ3xG9A8lfT+JuRVCRMg1oama7870n+BqI31e+t8iqST052RowF3avJ7GC2Qz5e95 Xlug== X-Gm-Message-State: AOUpUlFSjlIj5bQU5ZTac26EvZrVuMu0k3ipoLzFnnARBaewxQBpDaen rXhGK5rFnH9yzRsMbMwArB/WcyHO X-Received: by 2002:ac8:3f53:: with SMTP id w19-v6mr21217823qtk.2.1532533608444; Wed, 25 Jul 2018 08:46:48 -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.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 08:46:48 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Jul 2018 17:46:39 +0200 Message-Id: <20180725154640.89762-3-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180725154640.89762-1-vittorio.giovara@gmail.com> References: <20180725154640.89762-1-vittorio.giovara@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] vf_tonemap_opencl: Move update_metadata() to a shared file 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/colorspace.c | 17 +++++++++++++++++ libavfilter/colorspace.h | 1 + libavfilter/vf_tonemap_opencl.c | 19 +------------------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/libavfilter/colorspace.c b/libavfilter/colorspace.c index d6f6055401..c6682216d6 100644 --- a/libavfilter/colorspace.c +++ b/libavfilter/colorspace.c @@ -118,3 +118,20 @@ double ff_determine_signal_peak(AVFrame *in) return peak; } + +void ff_update_hdr_metadata(AVFrame *in, double peak) +{ + AVFrameSideData *sd = av_frame_get_side_data(in, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + + if (sd) { + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data; + clm->MaxCLL = (unsigned)(peak * REFERENCE_WHITE); + } + + sd = av_frame_get_side_data(in, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd) { + AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data; + if (metadata->has_luminance) + metadata->max_luminance = av_d2q(peak * REFERENCE_WHITE, 10000); + } +} diff --git a/libavfilter/colorspace.h b/libavfilter/colorspace.h index 75705ecfc7..936681815a 100644 --- a/libavfilter/colorspace.h +++ b/libavfilter/colorspace.h @@ -45,5 +45,6 @@ void ff_fill_rgb2xyz_table(const struct PrimaryCoefficients *coeffs, double rgb2xyz[3][3]); double ff_determine_signal_peak(AVFrame *in); +void ff_update_hdr_metadata(AVFrame *in, double peak); #endif diff --git a/libavfilter/vf_tonemap_opencl.c b/libavfilter/vf_tonemap_opencl.c index 7455ebb9fb..5da2333169 100644 --- a/libavfilter/vf_tonemap_opencl.c +++ b/libavfilter/vf_tonemap_opencl.c @@ -21,7 +21,6 @@ #include "libavutil/bprint.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" -#include "libavutil/mastering_display_metadata.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -342,22 +341,6 @@ fail: return err; } -static void update_metadata(AVFrame *in, double peak) { - AVFrameSideData *sd = av_frame_get_side_data(in, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); - - if (sd) { - AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data; - clm->MaxCLL = (unsigned)(peak * REFERENCE_WHITE); - } - - sd = av_frame_get_side_data(in, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); - if (sd) { - AVMasteringDisplayMetadata *metadata = (AVMasteringDisplayMetadata *)sd->data; - if (metadata->has_luminance) - metadata->max_luminance =av_d2q(peak * REFERENCE_WHITE, 10000); - } -} - static int tonemap_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) { AVFilterContext *avctx = inlink->dst; @@ -444,7 +427,7 @@ static int tonemap_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input) av_frame_free(&input); - update_metadata(output, ctx->target_peak); + ff_update_hdr_metadata(output, ctx->target_peak); av_log(ctx, AV_LOG_DEBUG, "Tone-mapping output: %s, %ux%u (%"PRId64").\n", av_get_pix_fmt_name(output->format),