From patchwork Sun May 3 22:05:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 19471 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 340B044B916 for ; Mon, 4 May 2020 01:06:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2148568C255; Mon, 4 May 2020 01:06:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 654A468B330 for ; Mon, 4 May 2020 01:06:10 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id x18so18683977wrq.2 for ; Sun, 03 May 2020 15:06:10 -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=oeka2T44MzcMCt6jXarcUbv4tFS/UT/fSy4ACon/18s=; b=P51TkyaMgoIKBv65kVXILfEZbkH5bYf5DemnrIgfUB4Tww7B8qyBeslkXmN9u8WLMc sVLrS67naSBF4Uw+O3QW8P6CVZ/2sQHoa5ZftqnJlIwvODvKFbvgoFWR8MxGy+Z0nshT KJ4PQpT+HPA8Lp4c/hwlUkfIk0sNAAe2OunIu7o+Ll0NSQR25VNisZIPKwDLr0C+jIcL +ODmI4etSfErRljiPHQr48jaK97DZt5K35jFVydyat4WEnqXZ+gCXvQbLPy4SCY6CM8+ FmNtEe9D8GPIs//R2XMq2WoS5m445jm1puJ5TXFNhaFySSCAiE21ZtffsJe3119AlG9L ULBg== 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=oeka2T44MzcMCt6jXarcUbv4tFS/UT/fSy4ACon/18s=; b=lN8yVvP5BolGuGKq/2ovaD1hruW7MapMHwVNYi3K+x7vrV8hxcYemL95T1+LYK95CV CIm7G77kZf3sj5c+oQVlZ0jwlUajSW8RO+Wyb4ZREao+w7gFY67KAHYZhkcopv5iSVLK 3XK/FTdlaOOOH285ku3kh3IOtQv1shC7juNStUu9ihGPImRXO6C6JWqfy43pA8SF8jZr tp+tq146c0ze3iXEkwu/BT57n8ZY6V7qQJtXbW08zWBQ/S35VJ1VZ8G8i3H72tfIjeiM IRbnMII+THfyj0P304Q3ezOLfB1jSDPYpqPY6f9mX3Jlgdb9TkgGScPeMp2LDmowesY1 8OFw== X-Gm-Message-State: AGi0PuZ548Xz5LHjkPt9Vlk/9oqan6PzPQIgfQ2VVRHYITe4o6VSw5IA /WnWrXQSRKZS6W3YUzkM6fE75m1+CJc= X-Google-Smtp-Source: APiQypJQqunFTiEryXJh6zGtpzRMs20beb6MsratKJ5Vq4Den86AYd+JFFjWV4LwRP2dm2HVuRlgvg== X-Received: by 2002:adf:fa89:: with SMTP id h9mr7384659wrr.119.1588543569535; Sun, 03 May 2020 15:06:09 -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 a24sm10307285wmb.24.2020.05.03.15.06.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 15:06:08 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 May 2020 23:05:46 +0100 Message-Id: <20200503220548.23543-20-sw@jkqxz.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200503220548.23543-1-sw@jkqxz.net> References: <20200503220548.23543-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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 ee44d7c442..4307da7bb1 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -745,39 +745,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; } } @@ -790,13 +761,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; }