From patchwork Mon Jul 27 16:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21305 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 2164044AF2C for ; Mon, 27 Jul 2020 19:36:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3ACE068B96D; Mon, 27 Jul 2020 19:33:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A14568B940 for ; Mon, 27 Jul 2020 19:33:04 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 184so15401262wmb.0 for ; Mon, 27 Jul 2020 09:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=S6m0VRg/3VFP2B3/ycgcKCh6q9UEH3fat0oY9XTM6LE=; b=o8Q386jdss8CFkxnZ6joOX38a8ZGyQ8lxKIDOzdxlKWdEqXGMQYaXdf5OzI3BnGJT1 kvJ0jGGpzVHWTzAZMIpuVjrs73R563tmW3pbF0boglwuh0KN5+NXh6+WYKql9CsrU15y MIiGlGuVWPjxGq/CZ/lBklOWya3eOCj8XPGAKcPPdEW359yWhTX7gwGz5nBISZRlJt04 5swZpWyl9t8Suji3cWmHyF49X0I47Hcwuikaf46re3kSjuWp4ZiPVkYJR4+QnGk+gLv4 sgSrRHg6fq21uLqE8l1iSw0N5+Rj3GLYgSQl6gH3L73qoHBtK6J60gLFkMBs8d8tuLo7 SWxw== 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:mime-version:content-transfer-encoding; bh=S6m0VRg/3VFP2B3/ycgcKCh6q9UEH3fat0oY9XTM6LE=; b=S2cEBzv93WtcwWOMLsVNmjGq4FgYf4T20QnyfuvwsYAclDVVyoT8Pqx0MKHqf9/ATy Polq+3/K3/3uD5FtdoXv12VcqWJBIzEf4VC8K1o+P5ZY3HkjIfSKwmxNuHx/oQMG25+t JldcqX759uj2QrJMVQlW2b3uS+N2VK3ZwyD+gtsSrYh2QeNxHs+J+dMU5S24Y6am2e09 VGuAXoHW7VwTL+W8ZFJpbmYJ+NUq+YXHNiq/YhDRaKs9lU3ltdCvJjvizxSrgJw81YGd vMvAAGByeZFDai1/ClIdpg0up2lObWHBzmgWBFAR5OIBnzcXA+Wwf85702p1ps1iQ4O7 G+EQ== X-Gm-Message-State: AOAM530hQF3lin19eBdMW394/nLyAfoQ2npaZuG5LP2SZqN80WAuAWtN nWlBGyRtmjj8yAzehELfLdIeFvGoCoE= X-Google-Smtp-Source: ABdhPJyDisTKrVMWRJ7Z31d1i9P2vTfk9YI5omrn6uAEjs+wNuiVVg1k5LiNW9fgUPDR7jpamiTryA== X-Received: by 2002:a7b:cb51:: with SMTP id v17mr125761wmj.146.1595867583324; Mon, 27 Jul 2020 09:33:03 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id w16sm14706791wrg.95.2020.07.27.09.33.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 09:33:02 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jul 2020 17:32:35 +0100 Message-Id: <20200727163237.23371-21-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727163237.23371-1-sw@jkqxz.net> References: <20200727163237.23371-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 20/22] vaapi_encode_h265: Use common handling for HDR metadata 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" --- libavcodec/vaapi_encode_h265.c | 45 +++++----------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 90fea83388..f996f78f8e 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -768,39 +768,10 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data; - // SEI is needed when both the primaries and luminance are set + // Only needed when both primaries and luminance are set. if (mdm->has_primaries && mdm->has_luminance) { - H265RawSEIMasteringDisplayColourVolume *mdcv = - &priv->sei_mastering_display; - const int mapping[3] = {1, 2, 0}; - const int chroma_den = 50000; - const int luma_den = 10000; - - for (i = 0; i < 3; i++) { - const int j = mapping[i]; - mdcv->display_primaries_x[i] = - FFMIN(lrint(chroma_den * - av_q2d(mdm->display_primaries[j][0])), - chroma_den); - mdcv->display_primaries_y[i] = - FFMIN(lrint(chroma_den * - av_q2d(mdm->display_primaries[j][1])), - chroma_den); - } - - mdcv->white_point_x = - FFMIN(lrint(chroma_den * av_q2d(mdm->white_point[0])), - chroma_den); - mdcv->white_point_y = - FFMIN(lrint(chroma_den * av_q2d(mdm->white_point[1])), - chroma_den); - - mdcv->max_display_mastering_luminance = - lrint(luma_den * av_q2d(mdm->max_luminance)); - mdcv->min_display_mastering_luminance = - FFMIN(lrint(luma_den * av_q2d(mdm->min_luminance)), - mdcv->max_display_mastering_luminance); - + ff_cbs_h265_fill_sei_mastering_display( + &priv->sei_mastering_display, mdm); priv->sei_needed |= SEI_MASTERING_DISPLAY; } } @@ -813,13 +784,9 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); if (sd) { - AVContentLightMetadata *clm = - (AVContentLightMetadata *)sd->data; - H265RawSEIContentLightLevelInfo *clli = - &priv->sei_content_light_level; - - clli->max_content_light_level = FFMIN(clm->MaxCLL, 65535); - clli->max_pic_average_light_level = FFMIN(clm->MaxFALL, 65535); + ff_cbs_h265_fill_sei_content_light_level( + &priv->sei_content_light_level, + (const AVContentLightMetadata*)sd->data); priv->sei_needed |= SEI_CONTENT_LIGHT_LEVEL; }