From patchwork Thu Aug 5 08:18:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp190707ioh; Thu, 5 Aug 2021 01:22:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMU2AVX4S6mANpeD4wTty8NT8JzSkrR7dYm9l5DXZknUMOF6E+ZxuE3sUer0GaDODSabv6 X-Received: by 2002:a50:ee15:: with SMTP id g21mr4925398eds.88.1628151749638; Thu, 05 Aug 2021 01:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628151749; cv=none; d=google.com; s=arc-20160816; b=zdBqPG3PSebfSceMkjxGp6xKelv26DPL5cn8Nuc2L5fQcI3pt8MEbAQ6T6NFYdz/D1 VlkKsAqId5EoBRyj6lrXZKG41YSQiJPZ4XG4qgZbVr22NhJe2cnSfyoAt6nV4yLl6Rz4 d/Q9hXZF1Pd5sNlAeLCDWVVz3n/piluCv4m55OBMRL7PFfoBo57+URZRFrHuM9SZaISu mHeP3VjqnDZIMI7Ym9C2wCzLp5qRTGyWPjEbXzHVMH8hMP7v/duHIQN1FnlZUbJ48+Nf rs+XcGAAHauaaNXJpdTDZuDo6YiUXUdD1U+Y9FeTE1OzqtacjDJhajHJfQRVpi3FL4T2 UpAA== 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=cKrsF89xCV5btiHI+D5hkaA3K4ChQjV6r0VsgkPn2Jg=; b=BTMJrjA8Jf1ZtLLtPXyYLfZ84ZX3MklJWHeT5mMTBAmm54K0SBt/PDMhrCcMEJ1Q2K jhfbxw68oriD2qyZCxUpGsJJKyBvNZMUp8LldmuMJDyaESyblGDRHpfgGyeVI1vzIl7X DUk3EWzBN8UL0Hau35aPN15UvApf44A8/TcIQmmjPltmZQRNCDCKKQ2PnAA2w12evdTF cl8NsnBTmj3TD/iLgrzUafX2y7d5RveDTK2rCRYuJt1nOlJFh04oUAyklqzu+4QnY8ny 6zGsaQtntHpjUmiyGfLvtFdhft7sh2fKhjLRJqqihLWN61HL/maqPP3wJt+OOMrxVgJT rSPQ== 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 u26si4932444ejr.374.2021.08.05.01.22.29; Thu, 05 Aug 2021 01:22:29 -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 34DE268A46B; Thu, 5 Aug 2021 11:21:28 +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 37AFD68A351 for ; Thu, 5 Aug 2021 11:21:25 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10066"; a="236062028" X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="236062028" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:48 -0700 X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="522442397" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:47 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 16:18:58 +0800 Message-Id: <20210805081910.9386-9-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210805081910.9386-1-haihao.xiang@intel.com> References: <20210805081910.9386-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v5 08/20] lavfi/vpp_qsv: allow user to set scale_mode with constant 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: GjY/Culgwulk In addtion, update the help text for scale_mode $ ffmpeg -hwaccel qsv -c:v h264_qsv -i input.h264 -vf \ "vpp_qsv=scale_mode=hq" -f null - --- libavfilter/vf_vpp_qsv.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index e8cba3c360..ea4948f2fe 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -138,7 +138,17 @@ static const AVOption options[] = { { "height", "Output video height(0=input video height, -1=keep input video aspect)", 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(qsv.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" }, +#if QSV_HAVE_SCALING_CONFIG + { "scale_mode", "scale mode", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, + { "auto", "auto mode", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_SCALING_MODE_DEFAULT}, INT_MIN, INT_MAX, FLAGS, "scale mode"}, + { "low_power", "low power mode", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_SCALING_MODE_LOWPOWER}, INT_MIN, INT_MAX, FLAGS, "scale mode"}, + { "hq", "high quality mode", 0, AV_OPT_TYPE_CONST, { .i64 = MFX_SCALING_MODE_QUALITY}, INT_MIN, INT_MAX, FLAGS, "scale mode"}, +#else + { "scale_mode", "(not supported)", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS, "scale mode" }, + { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = 0}, 0, 0, FLAGS, "scale mode"}, + { "low_power", "", 0, AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, FLAGS, "scale mode"}, + { "hq", "", 0, AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, FLAGS, "scale mode"}, +#endif { NULL } };