From patchwork Fri May 14 04:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp120759iof; Thu, 13 May 2021 21:56:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9V3R/04T0/5hihSv+zZHJdShUNFYC2NqZq6sSQumhaOlwEF5FexyvsOANNHKlSmbCVQI+ X-Received: by 2002:a05:6402:154d:: with SMTP id p13mr54896172edx.371.1620968186594; Thu, 13 May 2021 21:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620968186; cv=none; d=google.com; s=arc-20160816; b=H8Ba55vHvRgQwZebHh8GINlU6R5i7p1xCTNdaCxktVHMHeuqs7bxUpXZ0JyvEKUv/B G3+vh41VQsi5Vn1TjM+sNgAw/R5YCeiZTnGtL+NLhisI4yP/pLIqboxUek4yz9ZQ3UzV sW88NRa7Mr5acPveARLvtmAf8aIy1rn9UPcy/ygpMGu/cLpUbqShefQTkyGsTLl2bqch 2qazCqCqHBYfgcWELhzjRlyddYy+6QAbJ4huiXEmtwLFiW9uOkKi3rV3y6AgNzizUBds moLLU0Na72rq3KaPKjLINxRQd62xGQHAc61J/rOldT+IUk1MYHW9dwqsR4qkYRcYA7Gi ol/A== 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=VvxH2ZX8J5HVoLxtTVlhHnNd2R8GqbCxzb7RDAZThWWZwIEBrgvSf8WUIg8DPLDb2D b1rAm6DajORI+1GidyuZWSGWxE9DmtNKkkm7jDzmsMfuRHhAMQHUFL6E7hz7vl9tWu/K KkWozGdzCB4oyuCA8DhBMRkDmKiHPPFBb13G9kmHUkijQP0BZLUskfc0nMKYkCa/FH1x rHt/l3nvr1zX5aJu9PFFZf0eMZXYs8ZY3CfxdS94m7SqsBJbf48feQFIDJAqVYOhpEq/ aRuA++4uV5jQXwkDCPznhcn7aJbHwixwHZF7a8Pn94Y4iUU82V96CiQKqhTFuGGs76M8 Pypw== 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 x24si1373270ejw.605.2021.05.13.21.56.26; Thu, 13 May 2021 21:56:26 -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 C301F6883C8; Fri, 14 May 2021 07:54:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 654D76881B5 for ; Fri, 14 May 2021 07:54:41 +0300 (EEST) IronPort-SDR: EmFL+dVIyuZKv2FlSdolFj1tm39X+HAQr9Sz53jbBsaQeE0yqcHLaOid4rTemWUdT3YbOS6/5U a/lkk/pH7fpw== X-IronPort-AV: E=McAfee;i="6200,9189,9983"; a="179711901" X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="179711901" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2021 21:54:39 -0700 IronPort-SDR: SH9eU5YiH6rL3QypfUuVfkhxEyXsSApshaDmAe/4hE9He5byqi0WMIG1p6GtHC8xkHpTKykHJd O2WPbHPYpioQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="626673090" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga005.fm.intel.com with ESMTP; 13 May 2021 21:54:32 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:53:46 +0800 Message-Id: <20210514045400.3277256-9-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210514045400.3277256-1-haihao.xiang@intel.com> References: <20210514045400.3277256-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/22] lavf/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: zSSA0a4WyyFV 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