From patchwork Wed May 22 04:16:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 49130 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp114514vqf; Tue, 21 May 2024 21:16:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX14dyKTXXuI6TIMxjTjaFnYDZoy/bUVtfBPXYLiQ7IBRFQvr4s8nHO1qrRebY+rajgvJT5YI3yxJF4OmwAnU/oUFb4trFvt9Reaw== X-Google-Smtp-Source: AGHT+IFEhyLlIjCq56RNL+nWY3VjKTkjrOqYaDRroF3DW3OYy9++uMcU9/WgDduZ9zWOqPGv1IBd X-Received: by 2002:a50:9f67:0:b0:573:50a6:d3b0 with SMTP id 4fb4d7f45d1cf-57832a07e05mr350694a12.3.1716351398285; Tue, 21 May 2024 21:16:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716351398; cv=none; d=google.com; s=arc-20160816; b=UgsxfaPk4jKf310uuFUiNLRnDcj2c1ANxRWiWsX/49e8MKHyFE+KyYxkijQiYbGXst fiUMZ1ieLrD79MaJtb03SFVpcRRcmmJ9jMTTsGV4fao/GT4zPflQdMph4fbaWV3wh+9J XOfWsAJTk73SaaaQm7JO/AjCi6/FM8jMpGGdzLpzrmt3v7L/6v4NAeuHiTCVWIOLgMaZ 2Ea0vshW8Eow1lPU5lkIRRV5y1oB2hGJaqfrk+IId8ORV/b9qtHbezNgIYuHRU0dLQ0h wTKOyDFquNTTdArogpVsf7jHuLM3Ts1p2OcFG1P0QJghE+kTs0/AQ4QgmM5D6xlH2eY5 DCTg== 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=JDywNKrlimbOx9D5BF2cT5NY/Ju0zdqreswTS1jCjN0=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=gYWYBzD9Lmrm6La/M03Wexa1mEk/7UKRoE4QNBTIeNU6AQ0YcG+AyEFO3W3bpZSbz6 iaFS9n3eQA+OYeSs9QrbL9fp4Kwy61eUyPXp2SbzoVHMcmiuauhafRQNqTHnPqWLkeMw p1YurVbeY0WvZQhRMvqxh2y1jzQvm3NjkgDzuxL53Zpxwl9zIhGhH8onIYXLWJrCQHzm tX2sglANxiLpIuneYt7XXeRcxmcPKYd8Hbt+YPYcPfqaF7ibJ/833g8gAg3pKbJc4tEx M3fChUjq0fFKNSVqXyPWrDf5MBa4M4nerN/B0LQKqrcmgqH8QN+oomEeOO8XC8Fvo7jg sTiQ==; 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="nDnhGCe/"; 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 4fb4d7f45d1cf-5733c32c3f8si14236649a12.427.2024.05.21.21.16.37; Tue, 21 May 2024 21:16:38 -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="nDnhGCe/"; 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 C8ACB68D3C9; Wed, 22 May 2024 07:16:28 +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.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C3F368D261 for ; Wed, 22 May 2024 07:16:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716351387; x=1747887387; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3nwruSs4Bf5eQsMQmnF8WUqOrKD+4n1alA5pRmre+Q8=; b=nDnhGCe/2nUtSvSGG28YCN0vYF7/5OCWYNmEF/ntOUtADqOgasm2fPaZ xE3SbVP+zyHXKeBPbKmoi+faDN2tPvu0P/pMO8eUQuJ4z/7MxEonXWgBJ t5XrxrpSxTE9oy0IOdF1XaJyK2EGqHfDpVXCMVUi161ZYUo1D6+UMbnLm Dwkx/zWwaL5oiEKaQ0SC5IX/FCpcGF0QPptJZFflE+T50JDlvrHs2BDCD hgzCXlqz8Ceo/LlXkgeOW2EdsiTIRtYXacL9TISB2iTKpanpv9GBpcHtt BPNdqQQPf/IPr9BdfGMlVRyAUGPTlo3lsknxcssclFRqfYNUnLyQkK743 w==; X-CSE-ConnectionGUID: XoPyfz04RO+qSYLsxLzo6w== X-CSE-MsgGUID: kLR775dmTWSsdkFrjrWWpQ== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="30084326" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="30084326" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:16:14 -0700 X-CSE-ConnectionGUID: mV4BWtr3RsWE06R1TLQjMA== X-CSE-MsgGUID: JJ4550AnQUGSS5K3DbH8Dw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33677187" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 21:16:12 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 12:16:00 +0800 Message-Id: <20240522041600.1564328-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240522041600.1564328-1-haihao.xiang@intel.com> References: <20240522041600.1564328-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: cxyQGpK4P9Ne From: Haihao Xiang The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam. Signed-off-by: Haihao Xiang --- libavcodec/qsvenc_av1.c | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c index 33727bb07e..56002746b9 100644 --- a/libavcodec/qsvenc_av1.c +++ b/libavcodec/qsvenc_av1.c @@ -25,6 +25,8 @@ #include #include "libavutil/common.h" +#include "libavutil/mastering_display_metadata.h" +#include "libavutil/mem.h" #include "libavutil/opt.h" #include "avcodec.h" @@ -39,6 +41,75 @@ 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; + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(*mdcv)); + if (!mdcv) + return AVERROR(ENOMEM); + + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME; + mdcv->Header.BufferSz = sizeof(*mdcv); + + for (int 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(*clli)); + 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 +132,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); }