From patchwork Fri Jan 1 21:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24746 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 3CF4B44AE1C for ; Fri, 1 Jan 2021 23:40:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AC6F68AA4A; Fri, 1 Jan 2021 23:38:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A988568A7C9 for ; Fri, 1 Jan 2021 23:38:15 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id w5so22895048wrm.11 for ; Fri, 01 Jan 2021 13:38:15 -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=hBf8DbD1+Bgi/564oCdVgNTuR0dzvlQ4LCJgxLpOljg=; b=kR0JK7nfs27kkgZa0BmSjA9f2vHxSIKM+3iU2SxgWj8jrvUqObAu0NxyHrRAVMXqpZ FTN2pn+B9jmeKK8QPJt3mcK58JZpPcOvmk3vMF9YRZKGU5lKJDVi614wQsKuDwM0e22K VGiV0fv6RPxVcCvFg/Zg0+Noi/s1emAR+YuIdZ309QK0RoRt7bgwDhFuJtMAZez+DIPd 4RSVdcw3d1+EwHPS+0qTJ4dFeXRCj/cc6XNEGA40jzYMluKs4cj5+apl+9BYmcNUzwLq vGq45C72xEsV6a88kB17IXqw3i4cOFtf7FQRm4yCSt3IABkkqbEcikderPytUuCPjS4I lAOQ== 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=hBf8DbD1+Bgi/564oCdVgNTuR0dzvlQ4LCJgxLpOljg=; b=pi/O7PaYH/iU61GodmJx2p4UJpGSP/cB8s5r/mytLZhtaF8F0LcJsW4TApsUhD3hKf tAGZxGl/09mSm4O6rkBPVcO6ogj6hxRnnKR6I9JrfZSKTi06+0dMlrttR8VMH0J3Q+iB YSBAL/9n2sw5MHVobkc4nU5Pu25S3FMVKPJRaWbl20apST/Ps0WrB+PIuWsRjad6y4+E Z937b6R8WrpTdedh/ezqaRi/hRNic6r3oEJV9O86jxx2+qoB7Eg8YzVhuHhiq4+FFs2M TeZwlspIqPRdOx+K+IMvEGeYjJdjfbnb1n5bYErmsW8xF15p7mvzUwgbKXam9LNM1CA5 L0OQ== X-Gm-Message-State: AOAM532v1qxVNPZmSgjEDCVDEFhhJ9nK99085/iGJAU4jZ9OaiR0PO5P FIv2Y+pc+UxCVVGni/OPK9n/5+kI63DHaQ== X-Google-Smtp-Source: ABdhPJz4mC0sj1i7HarZz9sNh50rpLZuPfkNMYHRc5lWiUwkHQMHAnQrQu/szFThfDU4ZCKO5bvbww== X-Received: by 2002:a5d:43cc:: with SMTP id v12mr43489506wrr.319.1609537095044; Fri, 01 Jan 2021 13:38:15 -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 v20sm18784595wml.34.2021.01.01.13.38.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 13:38:14 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 21:35:37 +0000 Message-Id: <20210101213537.169546-28-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210101213537.169546-1-sw@jkqxz.net> References: <20210101213537.169546-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/27] 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 7c352e982b..ab1a09f674 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,