From patchwork Sun Feb 23 23:41:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 17878 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 D4362449F1B for ; Mon, 24 Feb 2020 01:41:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE5A668B4D5; Mon, 24 Feb 2020 01:41:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B948A68B4BC for ; Mon, 24 Feb 2020 01:41:51 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id a9so7485663wmj.3 for ; Sun, 23 Feb 2020 15:41:51 -0800 (PST) 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=4KGhCdz/52Pa1viFYhkRU2vailMXPxJ/tpQS/t+piu8=; b=lupn7hZWPEBIRLtCANtZiXW/3jHb7B9laBjFMBmtSbNYw7CaORcxZxZql4Jdxijbhy FVkWNZJr6vTwQ8/eEKo8OrF1j3gYH6c7b2yRg29eUPPLm8L3s9T4PDUOCO5Kz+PYBysx CPhfkxR8ZcB+HfF2KiQrFOCvZeybB1saCxPCLUG9F9K9idC/F0ftFjQSJG+OOgXJNmrK yMJYCYLq6LohsxG4ntf4GPg69KvmD8HSz9mrkLXEUuBfuJCiEcef/HfnVtuXGt2SE79E C5cN/9X04OokVGbdk81l3+E4Ua2AEMNwXAxItrlTejd/7rQc3BZfGrzLe7+UUuHyEKrj S2NQ== 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=4KGhCdz/52Pa1viFYhkRU2vailMXPxJ/tpQS/t+piu8=; b=FiAT0TYnnCRzmu9ZV6O3pcq/mnx5eMNqiFZdy1rZsvP8u+b8T5nFjKWASr4BHFD5Gh Cux1Nbs3EvN/qbJ/qtA/9XBF8QhcHw9qGIkqRZiIkWEorf+fgQ6WyGg/KLehkv1bgxWq mI0UCaUVkU1c+fApuCOcofejWGd0tllWn16EW9sNiCUBNK0htQsTSqAWOwmmFsxmRI0l AlHpPEL6gbA0Y1ita0uj5sfi8fOReYRciKS92fkKsfb1L+wJxU/QYJyih5/Nce41LnEa zop1SbMiSlXsd4vl2ESgoAQAdCJERcrZKCzXqdBE7ZPuRzValHpzFak7StZEpYJjvNHQ LaPQ== X-Gm-Message-State: APjAAAUJgP1uvmpYejv5hSjQCYpjW5yNVYY2wrcUI1gB7UlQmAQhZVMi Sv7x8ABt+HXPRcExOzyBZVZHTQyb8VY= X-Google-Smtp-Source: APXvYqyI7Kneg/3t87UE+LXOQB9xq5aloXopQyyHcz97qfl910q58oWEBg1e02MlgJG3u/T9DkoHjw== X-Received: by 2002:a1c:4d03:: with SMTP id o3mr17542212wmh.164.1582501310918; Sun, 23 Feb 2020 15:41:50 -0800 (PST) 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 y131sm16358070wmc.13.2020.02.23.15.41.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 15:41:50 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 23:41:22 +0000 Message-Id: <20200223234124.17689-19-sw@jkqxz.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200223234124.17689-1-sw@jkqxz.net> References: <20200223234124.17689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 19/21] 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 538862a9d5..443139dfdb 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -750,39 +750,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; } } @@ -795,13 +766,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; }