From patchwork Sun Feb 21 19:51:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25880 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 872EE44A325 for ; Sun, 21 Feb 2021 21:56:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58D4F68A8BD; Sun, 21 Feb 2021 21:53:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 539B768A8F5 for ; Sun, 21 Feb 2021 21:53:42 +0200 (EET) Received: by mail-wm1-f41.google.com with SMTP id i9so1692360wml.5 for ; Sun, 21 Feb 2021 11:53:42 -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=hJlnmK7zf8lnNs9QOEPH58O5wS14BH0Fy3gG75fpKEo=; b=tFTF0ZLJusJJ4aIp6p0Qq6bh7cPG50AWvQx/MY06+zTmQUXnse8iFmHgHeog7sIY4M 37phD7KpKgxoMI5J05k7zyq96w8FULmN1fjHQ6ea2AlQAu6NPSrBuNZgxPgRr5kaEG0x XbBOMVgss8Ert1A2ZbAMKe+Y1qMaXFiK5xGg6gH44W2lcfU3mSv8+X2SsJIbZEVKs45O gwMOZv2gn6feMs6bUa8JU4IvRKRKogNMX/3l0akUNhJcYlwVBCMP6VD3pVXFyr+cbRsR JDO3UtE8UFVN6vnIWVDV4Eeqh65kFO/uy80cDTFf7ml1sMW+H0RQkexO0r/SwFusAgZe zlrA== 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=hJlnmK7zf8lnNs9QOEPH58O5wS14BH0Fy3gG75fpKEo=; b=mBnGbmPqlNwI94mI6x29s7WUJFongKwplajocKS/dOZmHqO7FMXGPEnmVpju2SK4eN Dq2xgN1brBs+MTOuQPJiJfE6aPmcR3jK48bEJf4HGzi/7vsDOCtJGxpZ64ddDqGa9df5 ih65cdtZoxDvW19SJFucj25QVSnyp0Iwj7oup6Olo0yRXZrMkEAsy0Z+y8tiaUztjJwc EYKmcOxEQKy7eq1uByOkg+PbH/eod5dlr3vdGOCF2/wM709rjWn5p3Pd3sHtpwpuuH4Q LCE5yEE2IZ8oIds6bNYGSDnIp7ga5cSnY4WQPm/up+2AYNyv5MSZUIOWo727le6WoRBe H4Kw== X-Gm-Message-State: AOAM531kIPVbTlzKaT+84oosnPNjS5FxRWAOjNtZFjD4hSe2xLs5XRDz 4G2CLYQRpOuBT4kZJvOwbrMXSAhQ+Ok+YA== X-Google-Smtp-Source: ABdhPJyaA/VHKie/1NFR8ZI4aasjhlXRRvR/+C2DlXItmTqsheN+UPCiGJ2N9jfi0oJrVZC4Hhs8mw== X-Received: by 2002:a1c:a985:: with SMTP id s127mr11368743wme.158.1613937221828; Sun, 21 Feb 2021 11:53:41 -0800 (PST) Received: from localhost.localdomain (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id z18sm1780372wrs.19.2021.02.21.11.53.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 11:53:41 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 19:51:24 +0000 Message-Id: <20210221195125.1901683-17-sw@jkqxz.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210221195125.1901683-1-sw@jkqxz.net> References: <20210221195125.1901683-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 17/18] vaapi_encode_h264: Support 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" This can now be done in exactly the same way as it is for H.265. --- libavcodec/vaapi_encode_h264.c | 66 +++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index b546ddec08..582a855586 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -24,11 +24,13 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/internal.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "avcodec.h" #include "cbs.h" #include "cbs_h264.h" +#include "cbs_metadata.h" #include "h264.h" #include "h264_levels.h" #include "h264_sei.h" @@ -95,6 +97,11 @@ typedef struct VAAPIEncodeH264Context { int aud_needed; int sei_needed; int sei_cbr_workaround_needed; + + int have_mastering_display; + AVMasteringDisplayMetadata mastering_display; + int have_content_light_level; + AVContentLightMetadata content_light_level; } VAAPIEncodeH264Context; @@ -241,6 +248,20 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, if (err < 0) goto fail; } + if (priv->sei_needed & SEI_MASTERING_DISPLAY) { + err = ff_cbs_insert_metadata(priv->cbc, au, + CBS_METADATA_MASTERING_DISPLAY, + &priv->mastering_display); + if (err < 0) + goto fail; + } + if (priv->sei_needed & SEI_CONTENT_LIGHT_LEVEL) { + err = ff_cbs_insert_metadata(priv->cbc, au, + CBS_METADATA_CONTENT_LIGHT_LEVEL, + &priv->content_light_level); + if (err < 0) + goto fail; + } priv->sei_needed = 0; @@ -674,6 +695,42 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->sei_needed |= SEI_RECOVERY_POINT; } + if (priv->sei & SEI_MASTERING_DISPLAY) { + AVFrameSideData *sd = + av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + + if (sd) { + av_assert0(sd->size >= sizeof(priv->mastering_display)); + priv->have_mastering_display = 1; + memcpy(&priv->mastering_display, sd->data, + sizeof(priv->mastering_display)); + } + + if (priv->have_mastering_display && + (pic->type == PICTURE_TYPE_IDR || pic->type == PICTURE_TYPE_I)) { + priv->sei_needed |= SEI_MASTERING_DISPLAY; + } + } + + if (priv->sei & SEI_CONTENT_LIGHT_LEVEL) { + AVFrameSideData *sd = + av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + + if (sd) { + av_assert0(sd->size >= sizeof(priv->content_light_level)); + priv->have_mastering_display = 1; + memcpy(&priv->content_light_level, sd->data, + sizeof(priv->content_light_level)); + } + + if (priv->have_content_light_level && + (pic->type == PICTURE_TYPE_IDR || pic->type == PICTURE_TYPE_I)) { + priv->sei_needed |= SEI_CONTENT_LIGHT_LEVEL; + } + } + vpic->CurrPic = (VAPictureH264) { .picture_id = pic->recon_surface, .frame_idx = hpic->frame_num, @@ -1245,7 +1302,8 @@ static const AVOption vaapi_encode_h264_options[] = { { "sei", "Set SEI to include", OFFSET(sei), AV_OPT_TYPE_FLAGS, - { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT }, + { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT | + SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, 0, INT_MAX, FLAGS, "sei" }, { "identifier", "Include encoder version identifier", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER }, @@ -1256,6 +1314,12 @@ static const AVOption vaapi_encode_h264_options[] = { { "recovery_point", "Include recovery points where appropriate", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, INT_MIN, INT_MAX, FLAGS, "sei" }, + { "hdr", + "Include HDR metadata (mastering display colour volume " + "and content light level information)", + 0, AV_OPT_TYPE_CONST, + { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, + INT_MIN, INT_MAX, FLAGS, "sei" }, { "profile", "Set profile (profile_idc and constraint_set*_flag)", OFFSET(profile), AV_OPT_TYPE_INT,