From patchwork Wed Jun 12 00:58:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 49814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c504:0:b0:460:55fa:d5ed with SMTP id c4csp165196vqq; Tue, 11 Jun 2024 18:03:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5zcIfu64gjSgstb54fbE6ZIN7or6l++7SfVToKRam/KP0rJt+m+jhiM7NbgEzXPvRiCCJrrOJONH3nyMj1BCCjNZuMigKwaed/Q== X-Google-Smtp-Source: AGHT+IFSGp9c9nVjYwZEC4EfWld2oTFF4zT8TZWuJCntdppIUXdqI5IEPRN9ndmVlIGWnJFC4Pcu X-Received: by 2002:a50:9b15:0:b0:578:6959:9d36 with SMTP id 4fb4d7f45d1cf-57ca8e09bc8mr154326a12.0.1718154215047; Tue, 11 Jun 2024 18:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718154215; cv=none; d=google.com; s=arc-20160816; b=styhGyIsMGEwvUcGFsUbw41YShxCWSwnrcwtnaodhuoBZFOVNQmQq0MIN9nlSElCZb JY+Zp1B/COHm/efZ9xQ1bhqsQ84GH3XZx4aJU+Vc9Imxp6mMU1LdEJZBVkifvzEytjmN QdKXKOu7qrmqijxmtD1N8wWbIR0Z7GgE0iVz2KP0eVBHfKsOwOohw6/+rxTxrt2aQ8li ZmdvDzTkLpfeyx6DK0Q0h5Ns2FoYmEg0MPA2mjxRRM9U0nBlLNF58ZZTyvY0Q83Ft5+h QQTOY1tskSijwugSOBfVK0Hb1qaSdW3IejLVHZPfeyznevX3YsYU9VYSlGTd8GTUtKqD Ssfg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=4weA3KxfftpPdsUdpQuOI4SaWAAKY5p3kaZZd/fR7po=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=dHD/riOGiznDbBMPtpT7U7rEnWbvxZafoZ74clYM5R0dkX4lntSHdz+DiDQIQMu11p 4T/ujTF2KzerlwHBbNExIyVzRuaBXAwnHDy6NsyXnXLCCosMOFm1coJpgF4VPq9sDy1d IVzxJZBMPfSWSNIReZLL6IoOhOjbY1AMp9Dtr235rgYaeOQqQ6v/RZUzEGbs6d8KdRm7 L9RF9FI2pQ5uMaD9F9venC10bKw8TZsWN1KJaB4hfmhficvN+dXemif8SzTrhjRcEfQu 7M6/gcLmfh8fnswsIQNB3U29ugbEMZSVi/efIOma3vFhyac54UwIz2V05QKMMjlBqzsq XOxg==; 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=MW04NlKg; 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-57c70174e35si4211663a12.71.2024.06.11.18.03.34; Tue, 11 Jun 2024 18:03:35 -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=MW04NlKg; 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 5EB4668D8D7; Wed, 12 Jun 2024 04:03:30 +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.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7473368D823 for ; Wed, 12 Jun 2024 04:03: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=1718154207; x=1749690207; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=UHDtl4XVH62gX4MT0bzqDdUi5kuOGP7PW858mWynk3k=; b=MW04NlKg02pdCWzjE5XihtWxvZQoJwiTCiMHVR7s4viWOPzZHqfRmXra R4hvg2NAeDSt0PUSiHSFDcCXUBXR1Eq5i9jJIv7vmPMtC7cs1RrqBEjm7 F7vMR5a9nKxy40hy/2mTYZMIqMDfcpTeRHb8jiVNXbnBqZXIRsp14Hh+b b43W8Ks644M15r2oQEo4nfuUNZKQUff7y+2th4Bed8lUtYKC/S9rm61lv lm0Ieag+mgDgusTbVVeGEl0aMFUCy2WyOH65sgiyypwqqfZdJTZWPwEXf izgxFxyJEo7kReWKQGbvALhcWQbvm4IhoB+1nFSywz8kRGauof/secZpD A==; X-CSE-ConnectionGUID: cTi836CmTjO0Ll2R7Hzvpw== X-CSE-MsgGUID: Oyjo8fzwRtujn1nNFf63Fw== X-IronPort-AV: E=McAfee;i="6600,9927,11100"; a="18755111" X-IronPort-AV: E=Sophos;i="6.08,231,1712646000"; d="scan'208";a="18755111" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jun 2024 18:03:15 -0700 X-CSE-ConnectionGUID: kIbloZaYT6GXP0Rw/p5xMA== X-CSE-MsgGUID: kgFMBI3tQ8SpVpuc32nvhA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,231,1712646000"; d="scan'208";a="62794003" Received: from feiwan1-desk2.sh.intel.com ([10.238.212.15]) by fmviesa002.fm.intel.com with ESMTP; 11 Jun 2024 18:03:14 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 08:58:32 +0800 Message-Id: <20240612005832.3179960-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lJa3N1NSfcRQ 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, \