From patchwork Mon Apr 15 02:07:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 48059 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1583672pzb; Sun, 14 Apr 2024 19:08:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6H3v6f2WGTGf8bLM1v/InHA0kPZtLA5m6oEZxlfFZ0nVJp2d24Wrkb81EE/qh2MNzUl8sGQTHy3PokHeYRurVhvWos3VdQa2Y2w== X-Google-Smtp-Source: AGHT+IFLALcVp5IO2x8p+Z/A6FYs9ZVSECDzh32WRSvExAJ9J3MrObBJhoxr40nJnTylIfDNhssC X-Received: by 2002:a50:a6d9:0:b0:56e:22a1:a9a2 with SMTP id f25-20020a50a6d9000000b0056e22a1a9a2mr6857832edc.33.1713146904114; Sun, 14 Apr 2024 19:08:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713146904; cv=none; d=google.com; s=arc-20160816; b=KRXDsVLve1efb1ZQjpVN2JYdqFm+QO/7VIAcX0agi3RP/+wZgn0zqEeS+8iJh+bwsF 6/wMvJ0Bu3uFR10ps0HpSuyS8WM9UtiopQ45V2AqffAb0MtpEaMSFk4AT2sGZcVQb89i RSpnffX/7m7icNHVVCG3VpYNaFDGpcrB6QZyeYOoGtSnqwvTCg9fE4kMHPT+e3m6yJFt 9x93Mmv0NmMANOmZgp2y235arBpmXfuLsI9AJMHfLzt52CKOIs3btIdBjq/ah/Uo4z8B 2IVsh06fo9HANhNNWMMV0ohepgRA20/qLWy7P2JneiXa0rRtxLPQtTS3h/zW1pHNcjo5 ZIXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=VNtmZIZOGkMQtFMdk6QUo8l6E1Q8obg4DZGupHavuB0=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=wRNhqk0tauFLJMomUw6g0C5vFz82426/aYNRVqd4dDIB1rd38Jy4+nWKSXiG5kUpWm +x+9d0JTLf/CSOH8TGOEVXXUgZcV2jA64l/t0RUcPUguessu9ctS8YLkGVmxNei2fYAh LzAiUQzWRKaL/nJirQKfrVWJSvUvQCj9+Ylllqu20YXTN17z3bpIDoa4GOtGDagrersa FHTADszEnZMjUmbNA1ghzD20Twex/0kgX51PqxprlTamb6OCsH4n6stfaYprY7JVdB5U utV2mELAb0qKJE4w4JA9LTZuT4BVz2WaehmGxH8gSBGHOng/hZOree7JqfFYuaq6+q1f itmg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OBIg0ybN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m22-20020a509316000000b0056e3fa0fbd1si4020027eda.495.2024.04.14.19.08.23; Sun, 14 Apr 2024 19:08:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OBIg0ybN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 752B668D3DC; Mon, 15 Apr 2024 05:08:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E32D68D3A5 for ; Mon, 15 Apr 2024 05:08:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713146898; x=1744682898; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0GCld+tAiKxjfOJ0nUkLM3/zu5aU2ENFpkB3OSFMDVw=; b=OBIg0ybNWCesmD7ajHKlj8JgFP5h/LWwgLV4tvngTfYC4clne+DPWrHo ah+D4N/6QbGU0+3XumoG20fyVe+22iMGR/ydjGoS6l1OdrCh2q9Y9Pxmb YC7LGGZkSvk+L+zYqoMza7bJD9x4Qn/pmp3+OtpXA+T688zA56oB3uusQ 94IxBba1yTkRqxjEJ6iFt/98+C0VuEOm9Q2p40wLzGOcbPpDpPcwW6zO0 tNVfZGzDpSwTVOdTuRCWCG7v9Dq0ng5X0bJvDOhB2bHCXHV9NYpAoUhWb 99VAgdqyJUDuLOgxo3iNS6vzu6QqYG9g6S3eU6wK3VAoLdmmSKzlFf1RM g==; X-CSE-ConnectionGUID: rAJzxKZ9QdO+3B7c+UmfzQ== X-CSE-MsgGUID: DI6HkLRsT3+RxtrzQcVI0w== X-IronPort-AV: E=McAfee;i="6600,9927,11044"; a="19943105" X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="19943105" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:11 -0700 X-CSE-ConnectionGUID: ZKyn4fBmQaqgxMYovrP41w== X-CSE-MsgGUID: xun5PippRKGlSv9GExUeiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="26186627" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:10 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 10:07:52 +0800 Message-Id: <20240415020754.674831-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/vaapi_encode_av1: implement write_extra_header callback X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gn/acV1gyeGF From: Haihao Xiang This can be used to insert a metadata OBU to the stream later. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_av1.c | 42 ++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index 02a31b894d..4b417b05e7 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -41,6 +41,8 @@ typedef struct VAAPIEncodeAV1Context { VAAPIEncodeContext common; AV1RawOBU sh; /**< sequence header.*/ AV1RawOBU fh; /**< frame header.*/ + AV1RawOBU mh[4]; /**< metadata header.*/ + int nb_mh; CodedBitstreamContext *cbc; CodedBitstreamFragment current_obu; VAConfigAttribValEncAV1 attr; @@ -659,6 +661,8 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx, 2 : 1)); } + priv->nb_mh = 0; + end: ff_cbs_fragment_reset(obu); return ret; @@ -735,6 +739,39 @@ end: return ret; } +static int vaapi_encode_av1_write_extra_header(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + int index, int *type, + char *data, size_t *data_len) +{ + VAAPIEncodeAV1Context *priv = avctx->priv_data; + CodedBitstreamFragment *obu = &priv->current_obu; + AV1RawOBU *mh_obu; + char mh_data[MAX_PARAM_BUFFER_SIZE]; + size_t mh_data_len; + int ret = 0; + + if (index >= priv->nb_mh) + return AVERROR_EOF; + + mh_obu = &priv->mh[index]; + ret = vaapi_encode_av1_add_obu(avctx, obu, AV1_OBU_METADATA, mh_obu); + if (ret < 0) + goto end; + + ret = vaapi_encode_av1_write_obu(avctx, mh_data, &mh_data_len, obu); + if (ret < 0) + goto end; + + memcpy(data, mh_data, MAX_PARAM_BUFFER_SIZE * sizeof(char)); + *data_len = mh_data_len; + *type = VAEncPackedHeaderRawData; + +end: + ff_cbs_fragment_reset(obu); + return ret; +} + static const VAAPIEncodeProfile vaapi_encode_av1_profiles[] = { { AV_PROFILE_AV1_MAIN, 8, 3, 1, 1, VAProfileAV1Profile0 }, { AV_PROFILE_AV1_MAIN, 10, 3, 1, 1, VAProfileAV1Profile0 }, @@ -762,6 +799,8 @@ static const VAAPIEncodeType vaapi_encode_type_av1 = { .slice_params_size = sizeof(VAEncTileGroupBufferAV1), .init_slice_params = &vaapi_encode_av1_init_slice_params, + + .write_extra_header = &vaapi_encode_av1_write_extra_header, }; static av_cold int vaapi_encode_av1_init(AVCodecContext *avctx) @@ -776,7 +815,8 @@ static av_cold int vaapi_encode_av1_init(AVCodecContext *avctx) ctx->desired_packed_headers = VA_ENC_PACKED_HEADER_SEQUENCE | - VA_ENC_PACKED_HEADER_PICTURE; + VA_ENC_PACKED_HEADER_PICTURE | + VA_ENC_PACKED_HEADER_MISC; // Metadata if (avctx->profile == AV_PROFILE_UNKNOWN) avctx->profile = priv->profile; From patchwork Mon Apr 15 02:07:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 48060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1583706pzb; Sun, 14 Apr 2024 19:08:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6I6ktC+nFfOjawGB6O//MNeA0q2Pp2pZLXpT6LpUscNYpioQC9Nw94mH2vr8R35BAqXUKBJtQKYgJgo4CHbwid+QO7+ChjRYHzg== X-Google-Smtp-Source: AGHT+IEbOYphXMoIYG+3KweWHQActQc/7hENCRd8sRM5bTIjkcytUeU9kSgydrL9vcJ6ke+svp8D X-Received: by 2002:a05:6512:3da3:b0:516:c241:a912 with SMTP id k35-20020a0565123da300b00516c241a912mr7290084lfv.1.1713146913190; Sun, 14 Apr 2024 19:08:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713146913; cv=none; d=google.com; s=arc-20160816; b=q3tfSZqKAUoBNscjg1STjXRagrRE3zPXJso+gut/llC0B9TI1qBwTHBL47h5v2jF8a o9Tj/nP7Zc3/dcXbCAbPKRHb1i5mBGXQQQ0RoWSyymUswb5dfKUvXhmIbGyRWWzKCpnQ 2EQr5p4l/jB+erq/qzhiSre6uh7vgO11NV4GNRsXfuEZZGkcyxA88mX1ICuz2qqw+vkf D17PyFoVFlWUA9LV8oZRwNx12xpZbM15qYbVl9h7CEhJP5Ho2jZBQhxFYPNaCS3DC7gR GB6q+bSzZKrM7Atfi8ip+0AM+m7kxiLEGhIjlp6Tbr2QK92Kw+jV07WXJr40uLROXzny YfRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=YrT+W5HRYC+I7nSY2ye+/6+N3GBiyjtgIStcaPFXJo8=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=wPHAlDpv5h1wZ4EKSQYRj1V3pwhJUap6j/zsQhEgV3gxHlz5yK9jbZxAPzEB4t5noA pUCijK6KmLNzbsEGHML/npA6kYFzY7REmVPN+Q9UNWnZbH0EOYLYoZH6BaodcVomDFGW yQ/nQgLlMn/qPu8zNA3z3Ckbs3C6+2bImM61+472qn9n3v/wnGGdRTw9unarpKfJn+X8 ZJML5N+IfMUGpD34MFwhGvhA5SF/GCnnvz23RawuqaiR8YF23Du+914LUa3wcqCWOKHX Tzhi5GmAR5kC8imSF8QvDucyFz14MdmZt2emcnNAc9C2lzINjLQjzXA9JH43C2Yppa2c NOOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=QFSC3c55; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i25-20020a1709064ed900b00a523b0516cfsi2780590ejv.757.2024.04.14.19.08.32; Sun, 14 Apr 2024 19:08:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=QFSC3c55; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84DB168D3EB; Mon, 15 Apr 2024 05:08:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5548F68D3A5 for ; Mon, 15 Apr 2024 05:08:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713146900; x=1744682900; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SUOQLmJxDXwiBu9ZtKMsVvAXEQSr75eHigWK12rwvgM=; b=QFSC3c55V5FQS/1rREIMqiHieqHRXtnd3wyEvP7s04En04Qf28Sg18mM Ay4bOMV+XXN7ari4jZEFfk/fgX2RDvel69X546Odor5WLbtfpwQLgYYAI Lo2W3o2JJ+eRLL6cjfAJILC7eXY2eWCtevAkBkn02L772QgY446YaMSL/ +eD/uEyx82GMWL5DwUdFAe6i5pkOGzbuKWz/tziF1j1ue02n8cRf6LdPN 0mHuWSclsNVGoqgHrJZkT1HvSMd9kWYcSe8dn30jlmnuhWiv4d6CjxnYu /RNLzZSM2J3pEbUmY5uLsMje4K+3O/LgABH/J+NI2VEv0Jbaxg13K/0ne A==; X-CSE-ConnectionGUID: IyxubGp+Rgq1eyrqd3QGDw== X-CSE-MsgGUID: 7Eqd5qDjSCqsUShCEKUbkw== X-IronPort-AV: E=McAfee;i="6600,9927,11044"; a="19943106" X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="19943106" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:11 -0700 X-CSE-ConnectionGUID: 5COPdwRTR0OYun81T3Usew== X-CSE-MsgGUID: lA/DNQJlTWGwlKtJ/w/rTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="26186630" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:11 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 10:07:53 +0800 Message-Id: <20240415020754.674831-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415020754.674831-1-haihao.xiang@intel.com> References: <20240415020754.674831-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/vaapi_encode_av1: Insert HDR_MDCV metadata if have X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jL5T6QyQPhGW From: Haihao Xiang Only look for HDR_MDVC on key frame on the output. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_av1.c | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index 4b417b05e7..4077d21202 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -23,6 +23,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/opt.h" +#include "libavutil/mastering_display_metadata.h" #include "cbs_av1.h" #include "put_bits.h" @@ -663,6 +664,51 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx, priv->nb_mh = 0; + if (pic->type == PICTURE_TYPE_IDR) { + AVFrameSideData *sd = + av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd) { + AVMasteringDisplayMetadata *mdm = + (AVMasteringDisplayMetadata *)sd->data; + if (mdm->has_primaries && mdm->has_luminance) { + AV1RawOBU *obu = &priv->mh[priv->nb_mh++]; + AV1RawMetadata *md = &obu->obu.metadata; + AV1RawMetadataHDRMDCV *mdcv = &md->metadata.hdr_mdcv; + const int chroma_den = 1 << 16; + const int max_luma_den = 1 << 8; + const int min_luma_den = 1 << 14; + + memset(obu, 0, sizeof(*obu)); + obu->header.obu_type = AV1_OBU_METADATA; + md->metadata_type = AV1_METADATA_TYPE_HDR_MDCV; + + for (i = 0; i < 3; i++) { + mdcv->primary_chromaticity_x[i] = + av_rescale(mdm->display_primaries[i][0].num, chroma_den, + mdm->display_primaries[i][0].den); + mdcv->primary_chromaticity_y[i] = + av_rescale(mdm->display_primaries[i][1].num, chroma_den, + mdm->display_primaries[i][1].den); + } + + mdcv->white_point_chromaticity_x = + av_rescale(mdm->white_point[0].num, chroma_den, + mdm->white_point[0].den); + mdcv->white_point_chromaticity_y = + av_rescale(mdm->white_point[1].num, chroma_den, + mdm->white_point[1].den); + + mdcv->luminance_max = + av_rescale(mdm->max_luminance.num, max_luma_den, + mdm->max_luminance.den); + mdcv->luminance_min = + av_rescale(mdm->min_luminance.num, min_luma_den, + mdm->min_luminance.den); + } + } + } + end: ff_cbs_fragment_reset(obu); return ret; From patchwork Mon Apr 15 02:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 48061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1583736pzb; Sun, 14 Apr 2024 19:08:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX8NbL9ITta1f5kUDl6nhL32wqe+I9jBLuc8AW11RTPbDdiNhcHPQfGZ1pILyUtRM4Iu/DsmwqI424E9hVHtbcRTjniouTdsHRv9Q== X-Google-Smtp-Source: AGHT+IF4zepb+cjTtwsdPowvmsxdvIFSco49oyN3k5c7+SJA0sLtjQPOwzjvCLEI0FEX9XDPfkGJ X-Received: by 2002:a17:906:a8d:b0:a52:4318:64d4 with SMTP id y13-20020a1709060a8d00b00a52431864d4mr2653922ejf.5.1713146921195; Sun, 14 Apr 2024 19:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713146921; cv=none; d=google.com; s=arc-20160816; b=GIXuwR0NoshuE78Hm27Tet/f4dwKMpYG90JZVHAqREt6fNBlpvzatnOIg4cvYrM3/k D0ASczA+yqjdqIdD0fIA/8k18kXyX/WjA+SceXiTh78cThPAGYbm15CaTAZTOGm1hoKn 9XddHM9gWvnNUGZTuqtYTQZqb7Cfc+L0GVsA4U0rfBJuauflAOm+cn23eQ5dmchQ8aZt ewCyPeH41I2ui8nQboziSOtpALu/QN3FBm8ypH9gjnR/y80A1GjOBI8CrFkSVxylAGs8 IYoJv73ox1qt5T9hL51j+gw5UV2PHb8Ir9jodRH/YywSpqj5UQxLO0I3tlaS4buEyr9g /pig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=HKLJGHZI3hiV6V93V1wbgkvvTogElzvhMtJogBOwges=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=e0VIunrBPholWiZWgYa9xk9jooLGWIqWotYS9FlxgwfQVhOMwJXN99aFm4PHFUTTIw jWnLlFq7MI877H7oRn0ZHIN/7rhz9BJTUXGmTn89/8rZhA2C7M4yLzeayatkLE6ejzkF w9SChqCdRvztR84c7WIsyScei5sDAItCV3esf6PmNxy7zVa4hwIs216FF8Lcw5UqI0i2 qZX2jrB9hGUKmCEJV4NSZJIY2I3L7dGDkbVl099SLZ8xLktajp9PWCE31Z8tnuqO6dfO tfY+R45qEqScDsSQD2WTOd7od5CF427q8+4AJPRkSK6kMprtR+12F9aPDqgummEWGA4+ aFcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=oEHEcDF6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fi10-20020a170906da0a00b00a51e45426aasi4063672ejb.515.2024.04.14.19.08.40; Sun, 14 Apr 2024 19:08:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=oEHEcDF6; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DF6D68D3FA; Mon, 15 Apr 2024 05:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0680C68D3DE for ; Mon, 15 Apr 2024 05:08:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713146904; x=1744682904; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ga3EQWFDE51eGGqnh7moO9xTr/5m1Qw2HBMbmLSm0d0=; b=oEHEcDF6xHEtJ53el5bvNsUv/HyEbnmVH03urRzXFBW/BUP67V4Xbq9R JxjrwvkEAWb3EB0H3CejqsmsSEtKyQjup1oC8lCIauo5mWJ4dUzE8sDOL PwbXDpSkSykhS+SYh1bgm8GGwfbLenMy4164+mSBmyUP54rjDScApUwE2 zppc7aAUJ5JRuQsYrYy9NJOPq6Doz+E1T0TlVfU5jLcgtYgdW8alWODU3 pONxJnV3dkYLxJNmMby2hOWq393DAx63NGZfDFKzlvprwEpxS7k4slbl3 d/Xw1jH5878Z7dwKDrmmHWFMYt1/gwdFZ8aTmvghUXZRiYrqdVehcDxpt A==; X-CSE-ConnectionGUID: HtoEXtr6Qha1iXJJ6j7FgQ== X-CSE-MsgGUID: Rtb8qQO3R4iC51AkXS95Og== X-IronPort-AV: E=McAfee;i="6600,9927,11044"; a="19943110" X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="19943110" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:13 -0700 X-CSE-ConnectionGUID: lIxqFO2zTUKF7Ivgl6nboQ== X-CSE-MsgGUID: UgA7RB33RCuQWz/tDWr/DQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,202,1708416000"; d="scan'208";a="26186635" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2024 19:08:12 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 10:07:54 +0800 Message-Id: <20240415020754.674831-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240415020754.674831-1-haihao.xiang@intel.com> References: <20240415020754.674831-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/vaapi_encode_av1: insert HDR_CLL metadata if have X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fjj+bNrGoADi From: Haihao Xiang Only look for HDR_CLL on key frame on the output. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_av1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c index 4077d21202..b868f5b66a 100644 --- a/libavcodec/vaapi_encode_av1.c +++ b/libavcodec/vaapi_encode_av1.c @@ -707,6 +707,21 @@ static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx, mdm->min_luminance.den); } } + + sd = av_frame_get_side_data(pic->input_image, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd) { + AVContentLightMetadata *cllm = (AVContentLightMetadata *)sd->data; + AV1RawOBU *obu = &priv->mh[priv->nb_mh++]; + AV1RawMetadata *md = &obu->obu.metadata; + AV1RawMetadataHDRCLL *cll = &md->metadata.hdr_cll; + + memset(obu, 0, sizeof(*obu)); + obu->header.obu_type = AV1_OBU_METADATA; + md->metadata_type = AV1_METADATA_TYPE_HDR_CLL; + cll->max_cll = cllm->MaxCLL; + cll->max_fall = cllm->MaxFALL; + } } end: