From patchwork Tue May 21 05:39:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 49082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp5019804pzb; Mon, 20 May 2024 22:40:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXByLb0oYtjGJlWtgkoOtUwjnBPyjy7aTlQ7dn1HPv7HMrsSyh9kKOVyDHpxVLW+l3bOhfXwHzz1gBmgO2hjeqjtWpiDiaNhU6UMA== X-Google-Smtp-Source: AGHT+IEpHLdUAeYPjo977e9in3mMTCPiU7fgIcKVYqCXK/f/2P/79rbdpo160uYbLIe4ZUaJ0ojp X-Received: by 2002:a05:6512:70f:b0:523:af1f:89d9 with SMTP id 2adb3069b0e04-523af1f8aa7mr10910243e87.58.1716270030358; Mon, 20 May 2024 22:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716270030; cv=none; d=google.com; s=arc-20160816; b=LDy6CR/kPGN9Cfqn5ip/77N4D9/br0nrEaErLV0prL+8VZsdwHAwQ4I940YEawshWQ sD3riU/JtfJwIP2DlnWACfFO3JiIWWP11gYr17yriv9AfeHozxFCI3XfwU/hCgmlzT/E jg9st7GB0xmw4lUnk2wHuN3T2QwlYcUjVKT5RJ5Byf7P6xCwyf5rq4c/OXcX5JGDSGss XZS+KXKk1/XYN44n4L3lak/t/dWpx4XwkATXS9n688C7quGCY6XD4jo2RwTCCfbAeBCm 7q54CwMcHUVwqbMw1lSYSiC2KTOSfV/TfUwG5RFZLM8s2BsxVqyxjLTiXDeQvCd/wgnn 1S9w== 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=KKZ/cSVIJB6jXEsQ77U/y4Ze7cUZlqzqDtihhw8EqPY=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=pyUGIc4zj5+cNh+e0F6GfNldyZoNncfbRPhHlyOk9d3VqeQHm858BAuaKtG8Kx47/A 0mmMbhvWM2QMtEsTaTU3DuFvjA97jhsEWJbBXYROUpr5thBJEkvGmKYTT7jPmCvl2TIl iEdmI8w8dFu8KYSbMG44vGGCraIt/s281ooqPfmYypMa9BHNaDO4xPk5JOSO2pjtGQD8 /mTzTPtTv1A9PMjdI0nK/x4hzMsSBSxFmomxPSJSQtLZ7IOeE1eRAHafopkAyw/hD5/G GJnc6ZrqY5OrcWDC+cZXzdaYLX6wmhT0C8XVe3cOoNgxyvkqNIwrrkZQcpeipDSTPQlC vYBQ==; 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=mGwlSUev; 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 a640c23a62f3a-a5a390bb041si1287417566b.634.2024.05.20.22.40.29; Mon, 20 May 2024 22:40:30 -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=mGwlSUev; 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 BC56768C27B; Tue, 21 May 2024 08:40:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97CA968C27B for ; Tue, 21 May 2024 08:40: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=1716270019; x=1747806019; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jEkbzgHoQhvjDSmIx/gFNLXU8f2o0sUxZzuxuT//Xnc=; b=mGwlSUevXFUDd3n5K/ntSxMw2DkBunz48N7J/bkRFORKmXJJL+UspST2 h9/P6ZPZTGU26uV5zmqwNEdBIzDrLzWyru/48PBj0sz/Ijuh9U/33z/uw 0jmS682ttOOcbUbRh0xIewSML5tbx5XPFUvUVY5jpg7EUD4uvevU1tWF7 smN5VvppV3zpVm02VXr3gRWNsSQJ1UTpb+T02gl1X9qYJJCAQqddVSwAh Bi6AFDfZLwWmN1luFLMt0laPvLZmtaRbCqEc7Wf4rSmynxh/6R9uPCeJs Dlozt3JVAwY4wdENpHjeUtN/NC89++vitI6X/wAS4HWnRNOLW3bT0N90q g==; X-CSE-ConnectionGUID: boxb4JmCTgixriuKwPM6cA== X-CSE-MsgGUID: ailPaVdbT/e+VwRQsrviZg== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="23109830" X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="23109830" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 22:40:07 -0700 X-CSE-ConnectionGUID: Mz+7lYiRT1erDMAi36pDfQ== X-CSE-MsgGUID: 9Am8afyXSfOH/ZLYZN/2QA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,176,1712646000"; d="scan'208";a="32659436" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 22:40:06 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2024 13:39:48 +0800 Message-Id: <20240521053948.1516155-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240521053948.1516155-1-haihao.xiang@intel.com> References: <20240521053948.1516155-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR 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: mjpn1bhv7tI+ From: Haihao Xiang The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam. Signed-off-by: Haihao Xiang --- libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c index 33727bb07e..a7d35d7bef 100644 --- a/libavcodec/qsvenc_av1.c +++ b/libavcodec/qsvenc_av1.c @@ -26,6 +26,8 @@ #include "libavutil/common.h" #include "libavutil/opt.h" +#include "libavutil/mem.h" +#include "libavutil/mastering_display_metadata.h" #include "avcodec.h" #include "codec_internal.h" @@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext { QSVEncContext qsv; } QSVAV1EncContext; +static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx, + const AVFrame *frame, mfxEncodeCtrl *enc_ctrl) +{ + QSVAV1EncContext *q = avctx->priv_data; + AVFrameSideData *sd; + + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11)) + return 0; + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd) { + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data; + + if (mdm->has_primaries && mdm->has_luminance) { + const int chroma_den = 1 << 16; + const int max_luma_den = 1 << 8; + const int min_luma_den = 1 << 14; + int i; + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume)); + if (!mdcv) + return AVERROR(ENOMEM); + + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME; + mdcv->Header.BufferSz = sizeof(*mdcv); + + for (i = 0; i < 3; i++) { + mdcv->DisplayPrimariesX[i] = + av_rescale(mdm->display_primaries[i][0].num, chroma_den, + mdm->display_primaries[i][0].den); + mdcv->DisplayPrimariesY[i] = + av_rescale(mdm->display_primaries[i][1].num, chroma_den, + mdm->display_primaries[i][1].den); + } + + mdcv->WhitePointX = + av_rescale(mdm->white_point[0].num, chroma_den, + mdm->white_point[0].den); + mdcv->WhitePointY = + av_rescale(mdm->white_point[1].num, chroma_den, + mdm->white_point[1].den); + + mdcv->MaxDisplayMasteringLuminance = + av_rescale(mdm->max_luminance.num, max_luma_den, + mdm->max_luminance.den); + mdcv->MinDisplayMasteringLuminance = + av_rescale(mdm->min_luminance.num, min_luma_den, + mdm->min_luminance.den); + + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv; + } + } + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd) { + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data; + mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo)); + if (!clli) + return AVERROR(ENOMEM); + + clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO; + clli->Header.BufferSz = sizeof(*clli); + + clli->MaxContentLightLevel = clm->MaxCLL; + clli->MaxPicAverageLightLevel = clm->MaxFALL; + + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli; + } + + return 0; +} + static av_cold int qsv_enc_init(AVCodecContext *avctx) { QSVAV1EncContext *q = avctx->priv_data; @@ -61,6 +134,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx) return ret; } + q->qsv.set_encode_ctrl_cb = qsv_av1_set_encode_ctrl; + return ff_qsv_enc_init(avctx, &q->qsv); }