From patchwork Wed Sep 16 07:07:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 22434 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CE463449EC1 for ; Wed, 16 Sep 2020 10:08:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4FF668B9E3; Wed, 16 Sep 2020 10:08:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 843D168B85C for ; Wed, 16 Sep 2020 10:08:01 +0300 (EEST) IronPort-SDR: RyLhw879iVSkE6T8I8IeITesa+PsVAuKcJVV1m7m6XJD25LaboAmkwcOTsoTOdSlh8ZAYMLOHp BBvuzM3doKAw== X-IronPort-AV: E=McAfee;i="6000,8403,9745"; a="156825853" X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="156825853" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 00:07:59 -0700 IronPort-SDR: ushxr60sDSxzARstOIoKqd9Br/5TmUyq40ChaOGk8z+t0ZhnP8iXX5JrYtu3kEI4rROuuY8FzV ZdTiT3pLTu2Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,431,1592895600"; d="scan'208";a="507894400" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga005.fm.intel.com with ESMTP; 16 Sep 2020 00:07:58 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Sep 2020 15:07:54 +0800 Message-Id: <20200916070754.185475-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvdec: Add QSV AV1 decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" AV1 decoder is supported on Tiger Lake+ platforms since libmfx 1.34 Signed-off-by: Haihao Xiang --- Changelog | 1 + configure | 1 + libavcodec/allcodecs.c | 1 + libavcodec/qsv.c | 4 ++++ libavcodec/qsvdec_other.c | 31 ++++++++++++++++++++++++++++++- 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 261b6b261a..1f93d6dd14 100644 --- a/Changelog +++ b/Changelog @@ -25,6 +25,7 @@ version : - AV1 decoder (Hardware acceleration used only) - SVS demuxer - Argonaut Games BRP demuxer +- Intel QSV-accelerated AV1 decoding version 4.3: diff --git a/configure b/configure index 5d68695192..591067a7a8 100755 --- a/configure +++ b/configure @@ -3139,6 +3139,7 @@ vp9_qsv_encoder_deps="libmfx MFX_CODEC_VP9" vp9_qsv_encoder_select="qsvenc" vp9_v4l2m2m_decoder_deps="v4l2_m2m vp9_v4l2_m2m" wmv3_crystalhd_decoder_select="crystalhd" +av1_qsv_decoder_select="qsvdec" # parsers aac_parser_select="adts_header" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 713c5686a4..ae5642829e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -820,6 +820,7 @@ extern AVCodec ff_vp9_mediacodec_decoder; extern AVCodec ff_vp9_qsv_decoder; extern AVCodec ff_vp9_vaapi_encoder; extern AVCodec ff_vp9_qsv_encoder; +extern AVCodec ff_av1_qsv_decoder; // The iterate API is not usable with ossfuzz due to the excessive size of binaries created #if CONFIG_OSSFUZZ diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 17720070f1..7816d2f93c 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -64,6 +64,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) case AV_CODEC_ID_VP9: return MFX_CODEC_VP9; #endif +#if QSV_VERSION_ATLEAST(1, 34) + case AV_CODEC_ID_AV1: + return MFX_CODEC_AV1; +#endif default: break; diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c index b4df76739c..2775e07955 100644 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@ -1,5 +1,5 @@ /* - * Intel MediaSDK QSV based MPEG-2, VC-1, VP8, MJPEG and VP9 decoders + * Intel MediaSDK QSV based MPEG-2, VC-1, VP8, MJPEG, VP9 and AV1 decoders * * copyright (c) 2015 Anton Khirnov * @@ -327,3 +327,32 @@ AVCodec ff_vp9_qsv_decoder = { .wrapper_name = "qsv", }; #endif + +#if CONFIG_AV1_QSV_DECODER +static const AVClass av1_qsv_class = { + .class_name = "av1_qsv", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_av1_qsv_decoder = { + .name = "av1_qsv", + .long_name = NULL_IF_CONFIG_SMALL("AV1 video (Intel Quick Sync Video acceleration)"), + .priv_data_size = sizeof(QSVOtherContext), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_AV1, + .init = qsv_decode_init, + .decode = qsv_decode_frame, + .flush = qsv_decode_flush, + .close = qsv_decode_close, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HYBRID, + .priv_class = &av1_qsv_class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_P010, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, + .hw_configs = ff_qsv_hw_configs, + .wrapper_name = "qsv", +}; +#endif