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 6315E4ABD6 for ; Fri, 14 Jun 2024 08:28:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 401B168D607; Fri, 14 Jun 2024 11:28:41 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD13A68D5CC for ; Fri, 14 Jun 2024 11:28:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718353719; x=1749889719; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3tNxyPv61LsbserIqF5qvlqftbbRMpw0TQRTHMrFTeI=; b=YG8vG6trMiOSeCgciGenk7LHfoFeqZe2MuzdbVtWEEZsyVxwC9Pb8IKz Xw2p8YV6FyLRdfN+gyaHMJRsp0LDSrqDMW1ICeiYaDDobHaW//tyVEqA0 XgYpG0y6C7JZHd5Z6ZSl39wE0UTYTnQDohfhcw2R38KtyyQwQqMCyv60V k/G/NInEsogZetKR1AM+bc7cROrtn4G2z9JJCJFazW0Dw1m/IqDSNWHza OH6tRo3CRyLsidiadtB5R6W0iUpckUFuhq/0d6iNNH7DClz7Tj82ixs1z 2GgguFJDtCMEMS+vqsbn3/Fnltyd/nKpD6YUohDpn/ffp/AuiLXgQi0PW A==; X-CSE-ConnectionGUID: U6+MyhyIRx2htpAXFdFfKw== X-CSE-MsgGUID: Uomneq6JQxm8/m3angE2XQ== X-IronPort-AV: E=McAfee;i="6700,10204,11102"; a="15364027" X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="15364027" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 01:28:26 -0700 X-CSE-ConnectionGUID: wkEYCO5mR+2O/hu7pPFCqQ== X-CSE-MsgGUID: ojXR0m+MSneOAEovVOlrdw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,237,1712646000"; d="scan'208";a="40534007" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by fmviesa009.fm.intel.com with ESMTP; 14 Jun 2024 01:28:25 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 16:28:54 +0800 Message-Id: <20240614082854.697581-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240614082854.697581-1-fei.w.wang@intel.com> References: <20240614082854.697581-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] lavc/qsvdec: Add VVC decoder 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: fei.w.wang@intel.com 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: Fei Wang Signed-off-by: Fei Wang --- Changelog | 1 + configure | 1 + doc/decoders.texi | 2 +- libavcodec/allcodecs.c | 1 + libavcodec/qsv.c | 4 ++++ libavcodec/qsvdec.c | 7 ++++++- libavcodec/version.h | 2 +- 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 881b0e67a3..1fd1fce0c6 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,7 @@ version : - VVC decoder compatible with DVB test content - xHE-AAC decoder - removed DEC Alpha DSP and support code +- Intel QSV-accelerated VVC decoding version 7.0: diff --git a/configure b/configure index 6d31698142..d50f444141 100755 --- a/configure +++ b/configure @@ -3421,6 +3421,7 @@ vp9_vaapi_encoder_select="vaapi_encode" vp9_qsv_encoder_deps="libmfx MFX_CODEC_VP9" vp9_qsv_encoder_select="qsvenc" vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m" +vvc_qsv_decoder_select="qsvdec" # parsers aac_parser_select="adts_header mpeg4audio" diff --git a/doc/decoders.texi b/doc/decoders.texi index 293c82c2ba..2fcc761d2f 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -157,7 +157,7 @@ Force to use a specific number of threads @section QSV Decoders The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC, -JPEG/MJPEG, VP8, VP9, AV1). +JPEG/MJPEG, VP8, VP9, AV1, VVC). @subsection Common Options diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b102a8069e..a73b4e1673 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -885,6 +885,7 @@ extern const FFCodec ff_vp9_mediacodec_encoder; extern const FFCodec ff_vp9_qsv_decoder; extern const FFCodec ff_vp9_vaapi_encoder; extern const FFCodec ff_vp9_qsv_encoder; +extern const FFCodec ff_vvc_qsv_decoder; // null codecs extern const FFCodec ff_vnull_decoder; diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 0c6fbd0dc0..221c1b24e5 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -73,6 +73,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) case AV_CODEC_ID_AV1: return MFX_CODEC_AV1; #endif +#if QSV_VERSION_ATLEAST(2, 11) + case AV_CODEC_ID_VVC: + return MFX_CODEC_VVC; +#endif default: break; diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index f2cd6ae05c..9ad3439991 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -933,7 +933,8 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, frame->pict_type = ff_qsv_map_pictype(aframe.frame->dec_info.FrameType); if (avctx->codec_id == AV_CODEC_ID_H264 || - avctx->codec_id == AV_CODEC_ID_HEVC) { + avctx->codec_id == AV_CODEC_ID_HEVC || + avctx->codec_id == AV_CODEC_ID_VVC) { if (aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_IDR) frame->flags |= AV_FRAME_FLAG_KEY; else @@ -1300,3 +1301,7 @@ DEFINE_QSV_DECODER(vp9, VP9, NULL) #if CONFIG_AV1_QSV_DECODER DEFINE_QSV_DECODER(av1, AV1, NULL) #endif + +#if CONFIG_VVC_QSV_DECODER +DEFINE_QSV_DECODER(vvc, VVC, NULL) +#endif diff --git a/libavcodec/version.h b/libavcodec/version.h index 7acb261bb3..37c4c39451 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 7 +#define LIBAVCODEC_VERSION_MINOR 8 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- 2.25.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".