From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 47A6E44EC9 for ; Mon, 28 Nov 2022 04:44:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BC1568B6B1; Mon, 28 Nov 2022 06:44:16 +0200 (EET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE7726806F5 for ; Mon, 28 Nov 2022 06:44:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610654; x=1701146654; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u8EdciRrw6nsJWOLFYLuPpColwg4CjWghpki+50umKA=; b=NjKdwMSFzQ6GbKymjLBqOFHPTtGPiUCcOdUyb4levVkDLaOu19NTpi2c 7z42dunNN6RrZNtz81EdB7S1c7PtK7d2ljI3MCJmUNynXB6fdpaL3wHYD VL0qfO97+BUt5oDYzy+QKtJMrJrZJib0MD30IWZ95oaeHIAcSJ5RkEPer LrGK7nDpi4ajSw0hgFIA4szGv3Dp9+fEOAadui7mZTbiT6M93tG33EQ7u cCci5j5qhsUT49U1+RjtdzBqdHEuqSv6qxTxsYqLhz0vNIe3/HY4I6CgM aIUgNSfQvODcVRV5uyNmrcPS+NtB4r9AySHcM28PmXWk3RUmC7LC6NgZz A==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321159" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321159" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272553" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272553" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:01 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:21 +0800 Message-Id: <20221128044321.613550-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128044321.613550-1-haihao.xiang@intel.com> References: <20221128044321.613550-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] lavfi/vf_vpp_qsv: scale_mode can be applied to color conversion 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 4a053f9145..a14b3de7b5 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -133,7 +133,7 @@ static const AVOption options[] = { { "height", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags = FLAGS }, { "format", "Output pixel format", OFFSET(output_format_str), AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS }, { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(async_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS }, - { "scale_mode", "scale mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, + { "scale_mode", "scale & format conversion mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, { NULL } }; @@ -492,7 +492,7 @@ static int config_output(AVFilterLink *outlink) } } - if (inlink->w != outlink->w || inlink->h != outlink->h) { + if (inlink->w != outlink->w || inlink->h != outlink->h || in_format != vpp->out_format) { if (QSV_RUNTIME_VERSION_ATLEAST(mfx_version, 1, 19)) { memset(&vpp->scale_conf, 0, sizeof(mfxExtVPPScaling)); vpp->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING; @@ -501,8 +501,8 @@ static int config_output(AVFilterLink *outlink) param.ext_buf[param.num_ext_buf++] = (mfxExtBuffer*)&vpp->scale_conf; } else - av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale option is " - "not supported with this MSDK version.\n"); + av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale & format conversion " + "option is not supported with this MSDK version.\n"); } if (vpp->use_frc || vpp->use_crop || vpp->deinterlace || vpp->denoise || -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".