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;