From patchwork Mon Apr 1 23:39:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12557 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 E4699447332 for ; Tue, 2 Apr 2019 02:39:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D62DB68ABDA; Tue, 2 Apr 2019 02:39:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3698868ABD0 for ; Tue, 2 Apr 2019 02:39:51 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z6so1067586wmi.0 for ; Mon, 01 Apr 2019 16:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=55XMDON+0Mur24rF4QC1PxREs00sAXHm/xK6V/JKrvE=; b=WltgHGmaoDdpQCbetSsVKQOwMteprz7gUfD+BCnVJ73mA1QdJjCRNq29QlIUsHNRIL EjRN4ncnkGuXzsXRAEMUeoZUm/GKVA/vn/9K/R+UVOVT2M/WRBC8WDTQEsASAF2MQuN8 m3I31xx3Z5dYhNixrsnkmw396ZOFQF7OTMDxlJP5JC3C7QxNbsoLOezuEQ4ITSK77YQ2 cShWqHuPTRbX/XRRlBajUp1yBksFW/br3we+Tkq3YllvGkE0o1ExFxp3drEZ6EdPwe04 ylCpBnBiR3+ROYp16vI1UCFL0igrx6OPvk9NSMpxLxg7njCfEq7szynDQcSVAc6ThQsk lovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=55XMDON+0Mur24rF4QC1PxREs00sAXHm/xK6V/JKrvE=; b=lJZbTb6dYj8744v/T22fe1uyUxtWyr0tuPW12FYm3bIJ2sxn6qr935wzyLFQ40XLwj 8Aqya2aAdMjcWAijtYpsqKEN/xIypWDJtYlRm2ZpD4qc+I+lylpjBrFL2xb4N4SuCJ/M rHA2H7ycWSMTPqmP0925UeXHpTCJD8RAv8VQpmypftBP14v8FR4vWWH/PhcH0/fO/uBW DMp1A3ztKDhG9gsHfUj6bUqg8K/7obSxTlHuVUR4ixQcxtLVTqgC3GZCgTugjI9Ssj2N qEXMg3mSI3RYNV6aXXlZ16tKSA54NDyaAtDa2ynBYIzFU5D3kry3cpUPZENJOZoOKBLc CPKA== X-Gm-Message-State: APjAAAXMHyCIlkP+AQvAPp0MiD4OAQ2LzdXVCV6FGazW1fmL9IfX2iQk S+MxqxpCqSIlgQI8JbtO1NiPaNGXOSE= X-Google-Smtp-Source: APXvYqzSZAJkI/wJlaTulx8wvyazS9M8LEhIjz8kugZm0oNZZzDxfhi4t7kFLpTCd5Peyr99X2hjFw== X-Received: by 2002:a1c:40c3:: with SMTP id n186mr1373681wma.3.1554161990425; Mon, 01 Apr 2019 16:39:50 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r30sm27943044wrr.46.2019.04.01.16.39.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:39:49 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 00:39:36 +0100 Message-Id: <20190401233940.5941-5-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190401233940.5941-1-sw@jkqxz.net> References: <20190401233940.5941-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/9] lavc/qsvdec: Add VP9 decoder support 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Zhong Li VP9 decoder is supported on Intel kabyLake+ platforms with MSDK Version 1.19+ Signed-off-by: Zhong Li --- On 20/03/2019 14:41, Li, Zhong wrote: > Yes, QSV is a marketing name which is no equal to libmfx/MSDK. > But would be better to keep consistent with others, such as "Intel QSV-accelerated VP8 video decoding" in pervious changelog? I don't think so? VP9 decoding with the QSV hardware is already supported, this only adds the additional option of using libmfx to access the same thing as well. Changelog | 1 + configure | 6 ++++++ libavcodec/allcodecs.c | 1 + libavcodec/qsv.c | 5 +++++ libavcodec/qsvdec_other.c | 31 ++++++++++++++++++++++++++++++- 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index cd4ed54f2c..d838873dd4 100644 --- a/Changelog +++ b/Changelog @@ -21,6 +21,7 @@ version : - Support decoding of HEVC 4:4:4 content in nvdec and cuviddec - removed libndi-newtek - agm decoder +- Intel libmfx VP9 decoding version 4.1: diff --git a/configure b/configure index f6123f53e5..60cbbaf39e 100755 --- a/configure +++ b/configure @@ -3058,6 +3058,8 @@ vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m" vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m" vp9_cuvid_decoder_deps="cuvid" vp9_mediacodec_decoder_deps="mediacodec" +vp9_qsv_decoder_deps="MFX_CODEC_VP9" +vp9_qsv_decoder_select="qsvdec" vp9_rkmpp_decoder_deps="rkmpp" vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9" vp9_vaapi_encoder_select="vaapi_encode" @@ -6157,6 +6159,10 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_ # can find the libraries and headers through other means. enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } +if enabled libmfx; then + check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9" +fi + enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load || diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 71fd74a07e..1f0233d971 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -776,6 +776,7 @@ extern AVCodec ff_vp8_v4l2m2m_encoder; extern AVCodec ff_vp8_vaapi_encoder; extern AVCodec ff_vp9_cuvid_decoder; extern AVCodec ff_vp9_mediacodec_decoder; +extern AVCodec ff_vp9_qsv_decoder; extern AVCodec ff_vp9_vaapi_encoder; // The iterate API is not usable with ossfuzz due to the excessive size of binaries created diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index bb0d79588c..389fdcff41 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -60,6 +60,11 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) #endif case AV_CODEC_ID_MJPEG: return MFX_CODEC_JPEG; +#if QSV_VERSION_ATLEAST(1, 19) + case AV_CODEC_ID_VP9: + return MFX_CODEC_VP9; +#endif + default: break; } diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c index 03251d2c85..d7a6d79f63 100644 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@ -1,5 +1,5 @@ /* - * Intel MediaSDK QSV based MPEG-2, VC-1 and VP8 decoders + * Intel MediaSDK QSV based MPEG-2, VC-1, VP8 and VP9 decoders * * copyright (c) 2015 Anton Khirnov * @@ -255,3 +255,32 @@ AVCodec ff_vp8_qsv_decoder = { .wrapper_name = "qsv", }; #endif + +#if CONFIG_VP9_QSV_DECODER +static const AVClass vp9_qsv_class = { + .class_name = "vp9_qsv", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_vp9_qsv_decoder = { + .name = "vp9_qsv", + .long_name = NULL_IF_CONFIG_SMALL("VP9 video (Intel Quick Sync Video acceleration)"), + .priv_data_size = sizeof(QSVOtherContext), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VP9, + .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 = &vp9_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