From patchwork Wed Oct 2 23:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 15480 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 51E4244A22E for ; Thu, 3 Oct 2019 02:11:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A38F6881B3; Thu, 3 Oct 2019 02:11:19 +0300 (EEST) 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 ABE82688144 for ; Thu, 3 Oct 2019 02:11:17 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id p7so551055wmp.4 for ; Wed, 02 Oct 2019 16:11:17 -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=GnUj0P2LsXXKZLgZD59dteV3GuK9LFcCNKFZe7WFQX0=; b=ffXybFzvIufYa8KF+LLBhmohM2VoaHLJsmrjTlSxDAs1poCsJ86huI9xqLIfHa9vM4 1Sre/JTxW9sVI3CtUgj/9SWseKNksvIep+gsFMJaIGJ4SA9r9/DkiZRq/UQLLsklYE6j 2yDM7ol00Lx0ojpb9AK03GLBH7/FNzsXGZbkJPq515AgUDfA6Ad0tj1U3/3cT8cBr1Mz bZSihzMaUI1/phP9MqeB6iaOmtUdCiOz4C+JBMnDVJhH268R1XkMf578G1TYSxYsMBfC F9kMzXtvq7ekztqcfyi4EnOTbElJwE4RQjzNGmX91cY0HShqoVGnTXroWgjlaeRSuu0y ti6A== 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=GnUj0P2LsXXKZLgZD59dteV3GuK9LFcCNKFZe7WFQX0=; b=OQNlJyOHoMaUrKxCSrux1RGy1AeFEAY+girevWrXe2kUCC9HSY0z72RD+DwZjagzyl YO0hEKyy+jAGeQRhIP31fT1qMeA+uE3+B0qBYp8bf54fgstFnV1yBmPkspPYcywdQ0rW pDK5pEBliCKH84oLPdK/KJkvdfz8FzCIY5sbwcNCtMAAQ6cqXmi1VrQnEKw08bmG23xG OWntfaKu20qI9vVK35qE0UKI8EKiBlu9wbfFmvgzPrFIydJi99s/p0Ieuan9l9Nxl/2T U4ynkTl5jm9bTXfuchRGnd1s7kMzXM+DoEDiLAyMNuyDMbe7aPvDHQM3PQkIjSmsFbxe rNcw== X-Gm-Message-State: APjAAAWpVm13RR6cfjWHwxsQtGSXE4DKzp9fELiWDePI2+MiKIrKoHYr x2Mk500yGt0G92AQvQjoKz9dPzoa7No= X-Google-Smtp-Source: APXvYqxRih9ifGT4e1fFoSi2GkY7MdZD9dIxOWk+9z9YiTGE2ivtOafv9Tg58mIoi3a/8N0Yx95h/w== X-Received: by 2002:a1c:cc0e:: with SMTP id h14mr4675867wmb.117.1570057512925; Wed, 02 Oct 2019 16:05:12 -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 o9sm1489808wrh.46.2019.10.02.16.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2019 16:05:12 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2019 00:04:53 +0100 Message-Id: <20191002230453.6462-18-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191002230453.6462-1-sw@jkqxz.net> References: <20191002230453.6462-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/18] 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; }