From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 87E584AE5F for ; Wed, 22 May 2024 04:16:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A43868D39C; Wed, 22 May 2024 07:16:22 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4270868D261 for ; Wed, 22 May 2024 07:16: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=1716351381; x=1747887381; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PaFfoXZLyZh9m+WTYjVQlAIcoHDAWG0iSX0kDks65B4=; b=J+jSCymk88E4p9YK3HvxmRpYOJzCgaBJFwXqVIeZVAc16s7OG6pjIAWR SMrTA7JBuBYrf9VZmGlf22l0ygutJkauyzhziG7/AbCAKprQ8G58L4D2Z UEF82L1HKQJ189EvBbQ8eBCPq00iW2++4yUtTa3E9Ykx1JDOV/vf2w5b5 GaSzqWmYnDp61Y2wyedvwHInQ3EkHncz7Kw28IrSpv1qxq0gbFtgHSaIK mgOd8KdWoLQCbzFkp8Yh4UJsA3JNS7ggfVlYmEvD9fJkXttPhc2iO38y0 HbZC0tCcZnyZH1/tVTm7xYe95yOEyVv+Vbp2zDSnEGMBHgtOzmSPbRhgc A==; X-CSE-ConnectionGUID: 2LGMMeSIS6aDeMrvUZ64og== X-CSE-MsgGUID: 0MZu3j8lQVi2QzqzoQB7Sg== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="30084325" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="30084325" 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:13 -0700 X-CSE-ConnectionGUID: 2ab/XsupSYKaK4fbBF1QJw== X-CSE-MsgGUID: 3QpTTD/JTPWbbQAqBNdkFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33677181" 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:11 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 12:15:59 +0800 Message-Id: <20240522041600.1564328-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang The SDK may provide HDR metadata for HDR streams via mfxExtBuffer attached on output mfxFrameSurface1 Signed-off-by: Haihao Xiang --- libavcodec/qsvdec.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index df0d49bc10..7741baff06 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -538,7 +538,8 @@ static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame) #endif #if QSV_VERSION_ATLEAST(1, 35) - if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 35) && avctx->codec_id == AV_CODEC_ID_HEVC) { + if ((QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 35) && avctx->codec_id == AV_CODEC_ID_HEVC) || + (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 2, 9) && avctx->codec_id == AV_CODEC_ID_AV1)) { frame->mdcv.Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME; frame->mdcv.Header.BufferSz = sizeof(frame->mdcv); // The data in mdcv is valid when this flag is 1 @@ -742,6 +743,45 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla return 0; } +static int qsv_export_hdr_side_data_av1(AVCodecContext *avctx, mfxExtMasteringDisplayColourVolume *mdcv, + mfxExtContentLightLevelInfo *clli, AVFrame *frame) +{ + if (mdcv->InsertPayloadToggle) { + AVMasteringDisplayMetadata *mastering = av_mastering_display_metadata_create_side_data(frame); + const int chroma_den = 1 << 16; + const int max_luma_den = 1 << 8; + const int min_luma_den = 1 << 14; + + if (!mastering) + return AVERROR(ENOMEM); + + for (int i = 0; i < 3; i++) { + mastering->display_primaries[i][0] = av_make_q(mdcv->DisplayPrimariesX[i], chroma_den); + mastering->display_primaries[i][1] = av_make_q(mdcv->DisplayPrimariesY[i], chroma_den); + } + + mastering->white_point[0] = av_make_q(mdcv->WhitePointX, chroma_den); + mastering->white_point[1] = av_make_q(mdcv->WhitePointY, chroma_den); + + mastering->max_luminance = av_make_q(mdcv->MaxDisplayMasteringLuminance, max_luma_den); + mastering->min_luminance = av_make_q(mdcv->MinDisplayMasteringLuminance, min_luma_den); + + mastering->has_luminance = 1; + mastering->has_primaries = 1; + } + + if (clli->InsertPayloadToggle) { + AVContentLightMetadata *light = av_content_light_metadata_create_side_data(frame); + if (!light) + return AVERROR(ENOMEM); + + light->MaxCLL = clli->MaxContentLightLevel; + light->MaxFALL = clli->MaxPicAverageLightLevel; + } + + return 0; +} + #endif static int qsv_decode(AVCodecContext *avctx, QSVContext *q, @@ -874,6 +914,12 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, if (ret < 0) return ret; } + + if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 2, 9) && avctx->codec_id == AV_CODEC_ID_AV1) { + ret = qsv_export_hdr_side_data_av1(avctx, &aframe.frame->mdcv, &aframe.frame->clli, frame); + if (ret < 0) + return ret; + } #endif frame->repeat_pict = -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".