From patchwork Thu Jul 29 05:24:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5501496ios; Wed, 28 Jul 2021 22:29:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxK05dcTg/JtuME7m3HjTh7FYMy9KXQuCqx3fTOKHPJwMFgAV0Lw5lfAqgef+/fdqs4z+bj X-Received: by 2002:a17:906:a04f:: with SMTP id bg15mr2956125ejb.417.1627536541033; Wed, 28 Jul 2021 22:29:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627536541; cv=none; d=google.com; s=arc-20160816; b=AlMfAXIR6QSBP8rtLCUtPbgZrGCQphNxF6fl9MpDCCKKFOK1W9VQFYBRDNUMCGAcL4 q9olYBPira7lFPQ1a2H7WyVNu9hdlHEoSdeiT4/yF1wp0WEdAMIrxdy7sQsUZYfABcsS TGCwuXvU7cPfVQcuxAgvf+MgrKt54OI5c4Sk1QUT2t+pY5pwiwhn7HeVZhYnMauJR4FC IVkpV81WvFj2Y+Wav4Gn8XPq2+nBbMdNaQmEqXUE/ZGpwjPjvkyMRWyKnOrj0ejKD/jN m/iqznpINeUvhVmZ862to5JhQBNPZ0QXC6YWGlGGlNQh7TlSs2TrjJBWD4Z/tRGyOzX6 sdXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=rfh+j/0M4aj1JZOtBC83IIdKcBBeM7PuPoT4YS3Ns/o=; b=wK5PXvCVQJqyeMnUTrXwPr1evQoysG5Yu58JUQXszmEPfgC50WA6/+7iit9N97OgdU YxzLURFfQm6TUExAs6umG51Q6SXSAS3EZhAwsSn0PYCQ7GFpieFPGkHGibO8ItUahj/X h/LyRsreegz3Mn5HYwVjbqlGapAH1NmjDAt2Yj17d80C3ltt1GQ8Nxr0IBxndC6yKrri xVRT6jaFZ10lZJWx/1OOJp6pZjbPqBVlZYa7cyj6WHKdXeb8vNYmbq6+kWJYGxG2wABt hpszgm/vhxlNvMOytxF8dRyHPbVmzvSVij3wGtSbDBdzW3wZ+eig3gqtrmh68c8Zu6XO wbDg== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u16si1966385ejt.97.2021.07.28.22.29.00; Wed, 28 Jul 2021 22:29:01 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA0EA689CDD; Thu, 29 Jul 2021 08:26:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21A2468A4C5 for ; Thu, 29 Jul 2021 08:26:11 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="200023637" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="200023637" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:25:54 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="456730106" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:25:53 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jul 2021 13:24:56 +0800 Message-Id: <20210729052509.30992-9-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210729052509.30992-1-haihao.xiang@intel.com> References: <20210729052509.30992-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 08/21] lavfi/vpp_qsv: pass scaling mode to the SDK 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NMWZP45B0Qqr After this patch, the scaling mode will be passed to the SDK when the scaling mode is not equal to the default mode. This is in preparation for re-using VPPContext for scale_qsv filter --- libavfilter/vf_vpp_qsv.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 0c2614c95f..96908556f9 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -42,9 +42,10 @@ #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM) /* number of video enhancement filters */ -#define ENH_FILTERS_COUNT (7) +#define ENH_FILTERS_COUNT (8) #define QSV_HAVE_ROTATION QSV_VERSION_ATLEAST(1, 17) #define QSV_HAVE_MIRRORING QSV_VERSION_ATLEAST(1, 19) +#define QSV_HAVE_SCALING QSV_VERSION_ATLEAST(1, 19) typedef struct VPPContext{ QSVVPPContext qsv; @@ -57,6 +58,9 @@ typedef struct VPPContext{ mfxExtVPPProcAmp procamp_conf; mfxExtVPPRotation rotation_conf; mfxExtVPPMirroring mirroring_conf; +#if QSV_HAVE_SCALING + mfxExtVPPScaling scaling_conf; +#endif /** * New dimensions. Special values are: @@ -96,6 +100,8 @@ typedef struct VPPContext{ char *cx, *cy, *cw, *ch; char *ow, *oh; char *output_format_str; + + int scaling_mode; } VPPContext; static const AVOption options[] = { @@ -482,6 +488,17 @@ static int config_output(AVFilterLink *outlink) #endif } + if (vpp->scaling_mode) { +#ifdef QSV_HAVE_SCALING + INIT_MFX_EXTBUF(scaling_conf, MFX_EXTBUFF_VPP_SCALING); + SET_MFX_PARAM_FIELD(scaling_conf, ScalingMode, vpp->scaling_mode); +#else + av_log(ctx, AV_LOG_WARNING, "The scaling_mode option is " + "not supported with this MSDK version.\n"); + vpp->scaling_mode = 0; +#endif + } + #undef INIT_MFX_EXTBUF #undef SET_MFX_PARAM_FIELD