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 0B3204B720 for ; Wed, 12 Jun 2024 07:03:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2B0368D8B6; Wed, 12 Jun 2024 10:03:56 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2737868D7DB for ; Wed, 12 Jun 2024 10:03:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718175835; x=1749711835; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=UHDtl4XVH62gX4MT0bzqDdUi5kuOGP7PW858mWynk3k=; b=JXU9XyvBxQbrlKkKCUknYswQJ0c/Vn1jVsTm5D3SQmQVlI62ONmScakE t0K0MV4yEm9bCDls0Bzf4CWDgRhLBKL/qiDKc+5mR4jRuEmvjxq6TgOTk 9WBn+jZy6y1IaK1CkjQpJhTCSzvSeg+SQ+HsIybtoN2JKQhqs64QDfJbL rpJ4BvSsw9nAykFyyVSOvtWPdKtdik69C+EJzP/vw8L82Iplpu0lwMfHk pS88aB0Sz/MunfACVRbo6PBeq9iW9WrXWpIkE10K4/7lMmG+IZuX8gl1L JkyJzWTwpOqYKKvJXxHK+OyrQwWdlNP2Nfm/dOolPOBcAT7xZz6VmNwo4 Q==; X-CSE-ConnectionGUID: 4+GV1bPNTR2J7XNc9NwWew== X-CSE-MsgGUID: hdwerrmiSEaA9U8bsKc1cg== X-IronPort-AV: E=McAfee;i="6600,9927,11100"; a="26330483" X-IronPort-AV: E=Sophos;i="6.08,232,1712646000"; d="scan'208";a="26330483" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 00:03:47 -0700 X-CSE-ConnectionGUID: 9tdmO6MqTWm4/mvonrFXfA== X-CSE-MsgGUID: CznVJM+tQs+XWAaMP/yvFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,232,1712646000"; d="scan'208";a="44597768" Received: from feiwan1-desk2.sh.intel.com ([10.238.212.15]) by orviesa003.jf.intel.com with ESMTP; 12 Jun 2024 00:03:46 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 14:59:03 +0800 Message-Id: <20240612065903.3190528-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] 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 03d6b29ad8..a238a1c1f3 100644 --- a/Changelog +++ b/Changelog @@ -12,6 +12,7 @@ version : - qsv_params option added for QSV encoders - VVC decoder compatible with DVB test content - xHE-AAC decoder +- Intel QSV-accelerated VVC decoding version 7.0: diff --git a/configure b/configure index 6c5b8aab9a..b4cf12658d 100755 --- a/configure +++ b/configure @@ -3423,6 +3423,7 @@ av1_qsv_encoder_deps="libvpl" av1_amf_encoder_deps="amf" av1_vaapi_encoder_deps="VAEncPictureParameterBufferAV1" av1_vaapi_encoder_select="cbs_av1 vaapi_encode" +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".