From patchwork Tue Jun 15 06:13:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 28307 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3527526iol; Mon, 14 Jun 2021 23:17:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPCT+rM1AXfEGkgK8iLybZm2aSHq2LpcGEwuojfLgzohpwJlZkbE9vz6SlNM+M4mm4QzJ6 X-Received: by 2002:a05:6402:5256:: with SMTP id t22mr22026223edd.54.1623737824814; Mon, 14 Jun 2021 23:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623737824; cv=none; d=google.com; s=arc-20160816; b=GBqgneEXVGd91ZQJtMmyR5b6MWdFpgoT4iehzBT6psKdJDzBho4wx0Q17z09EYNZTv E0hClyfDQhKTA1QzzAV3web61PNoBewK8miQvg9Syrgqbhk7X31HU7+62lwQm5F9Ci6M O3qBN1yh/ybKX0UAtXeucod2pfsKWeiPHRgU305SlCAYbmSZE2vDGkioQsX27l1Be3v2 GiA7uU9RhCN/+YH+XoVmot1igbbL62LVOL9yWFZAzonhwyeFvoMyJ9zmQHGXagFk/q6Y WGl9C9ybwlGSVWgRVr9A++4eDag+sKHg1nUDydy14KrxXnnTiEh0nPcrvbMliuqC9ArE atJw== 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:references:in-reply-to :message-id:date:to:from:ironport-sdr:ironport-sdr:delivered-to; bh=4GjT3PbphGlNTsGEuRSevxvk34tvelPiCsi747kej8Y=; b=MZIfEkY3rQCM1pgbUSNK+g0CB7Qk6Jn0ktPVfuxpI+0CjKu5/+up3feeaqsIDt7HRj g0gZO1f+wQH5jYq8qvl1el4o+JENkXr3/t4JWBt6f8IR1Rb/wBbgEyy0tyEK9ZTvQ6G7 EdwRMUvDZaqwkiTY1DoOfQYRoy2OEsAn5EzXNYd6JXWNlS+gicbbNo9vBinJ0WpqYQsS mG23LcH692GYdWn5CvKaVX9gSxHJrGRJUz+oOAHlc6vcba2ZHnsQEd1dGgyn0VlO9hiB On4/nh7/p9VwuoBlt1WNq/kJRqscW3ll1Lvj62GzmLavAxaoduOYgQmFxXxF/8akYK0f ZfXA== 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 q25si13121365ejz.235.2021.06.14.23.17.04; Mon, 14 Jun 2021 23:17:04 -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 53AD56898E0; Tue, 15 Jun 2021 09:15:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0C67687F2A for ; Tue, 15 Jun 2021 09:15:44 +0300 (EEST) IronPort-SDR: 0G5rP5fJzzc+A5BVxadRf5R2rg/cKnn4oNKrNSsn9t2b7qO6KkRanlfphPb85s3VkB3/y9j9bp 8G2xt82tz1NA== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="227395417" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="227395417" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 23:15:36 -0700 IronPort-SDR: p8uloR0CNw/J2bRzhzRTWfAi/rVPlOgvmAm/FbipN+AaexWQQ2aFXx4ZOs3Od5HSbQAI1QU230 U+/PuKbIdGbA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="451857156" Received: from xhh-tgl64.sh.intel.com ([10.239.159.53]) by fmsmga008.fm.intel.com with ESMTP; 14 Jun 2021 23:15:34 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 14:13:49 +0800 Message-Id: <20210615061403.1576282-9-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615061403.1576282-1-haihao.xiang@intel.com> References: <20210615061403.1576282-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 08/22] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CSEdbwCHf+2/ 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 c9a7b0ceb9..fd45c4f352 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -43,9 +43,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; @@ -58,6 +59,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: @@ -97,6 +101,8 @@ typedef struct VPPContext{ char *cx, *cy, *cw, *ch; char *ow, *oh; char *output_format_str; + + int scaling_mode; } VPPContext; static const AVOption options[] = { @@ -483,6 +489,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