From patchwork Mon Sep 26 09:36:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38332 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2132846pzh; Mon, 26 Sep 2022 02:40:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4+qkhZ8cVnhTfejg0F4DKDg16PVtCUxOp5wIHE0+vrVZksytMQSz4pPZhbgozMEfmOe34r X-Received: by 2002:a17:907:a407:b0:783:5465:902 with SMTP id sg7-20020a170907a40700b0078354650902mr4942735ejc.35.1664185237672; Mon, 26 Sep 2022 02:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664185237; cv=none; d=google.com; s=arc-20160816; b=x6vprosHXPRFxD6Kp5zOIC55rk5k2bo5Hg1xfQXTBs8ep35RzC8LQC+v9DNFzNk6pL dU6nj93lrhtZKVe2/NQNyZNRFvfvtlY9BWextaoMgfV4hTBaCP/L14sI6wC9/eH+KKtc 6f3fFb5EmeRgjJMdKtp6r5Cj+SbOUCf8M7h7570dXywGeIUQlmuUo+p5j/DF0U2TZ/eR JqrHri+HxFAHyhMWPf7HZAwuUo/5nx7/8q4wX86q/XJQugMADRfRvwVLuXaicJgqYcis GU+yhY7F6W66iM9nndXIBoZk9dOEOTNi+HnaXNS2xQOOWDgi2ncA67/CoCfIIyc4OEps ZNkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=a3HyFgY3bx7c5bbV6/rEf6NYyXA/Ml8uNsyM5hgcS68=; b=fzd7Rb1mpJ9s2BqXihXqNG9GFjoua6Q6fvgmvReYllhFikGlMCbCMM15Nrne31v1Zd zuqPH7w60XZJWuLuayFvMit5BxipV/5hhdvbtcfCMnllbqCKHWec9m24WlccrwJVThqD 7qMtG7ICGLsBI5WgwmW0wtz58WB6NnGDAJIlagalLxilEEBgPD5zVg8Q4THlKCPQXQyC NWDY/ed8mgaIFdVGKcBb41OUeEpC1kvKg1ZdK7Z3uba/4/UpbyVpb++WTwYXj3UkPOxx Lux1SWmxTg9Eh6r5dscgjL1lcwMFPOJ1G2dw9xBHCSgG9ijJPzOQ8XAI4zcYj5usE9TL t5nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kWVAs2zZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c10-20020a05640227ca00b00446b33b356asi18956190ede.502.2022.09.26.02.40.37; Mon, 26 Sep 2022 02:40:37 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kWVAs2zZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A190368B320; Mon, 26 Sep 2022 12:40:33 +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 12FE768B320 for ; Mon, 26 Sep 2022 12:40:25 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664185231; x=1695721231; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=coySmSTEcrh3G8GqPLLNg5IH6xNwEPUwgHB/CKFNPw4=; b=kWVAs2zZD3sulvS6ZjUySsrKVSGgEh+sY4rBOrbmT32jl2NHsTaKuBKU cmL0GsYAC/8MRw+HFJcRnoxKRuH3sng5DeOYBtrjXqkTIBrEHcXb19kNC bTfhsbTZmS8AlafmTxWvugrFx9kX3/7rQ3zfNoCCxTXnMk3Gd2DePfX+h R8cwmaev0z4CLjJnLqntViCexdJm/WNBn72x/L29OivCGZ1zkQXBsIzdb jr/8Z+Tn9gsVc9VobaaCHHq293iCzPu6GncTB4wdz2c2A9crZBkUq17+6 uqtMs7t4XIfAU/JORCiHTGEggsG5YvSkf9SleIG+73QKyDKn0htzSD9So g==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="284102956" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="284102956" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 02:40:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="620983473" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="620983473" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga002.jf.intel.com with ESMTP; 26 Sep 2022 02:40:12 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 17:36:29 +0800 Message-Id: <20220926093630.72758-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] libavcodec/qsvenc: Let runtime to set default parameter. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MMXJh0RG++Xw Unset qsv_h264 and qsv_hevc's default settings. Let runtime to decide these parameters, so that it can choose the best parameter and ffmpeg-qsv can keep up with runtime's update. Signed-off-by: Wenbin Chen --- libavcodec/qsvenc_h264.c | 5 ++--- libavcodec/qsvenc_hevc.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 85826ae4be..11aaabbd1b 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -176,9 +176,8 @@ static const AVClass class = { static const FFCodecDefault qsv_enc_defaults[] = { { "b", "1M" }, { "refs", "0" }, - // same as the x264 default - { "g", "250" }, - { "bf", "3" }, + { "g", "-1" }, + { "bf", "-1" }, { "qmin", "-1" }, { "qmax", "-1" }, { "trellis", "-1" }, diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 6ec6230999..a5bf915954 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -289,8 +289,7 @@ static const AVClass class = { static const FFCodecDefault qsv_enc_defaults[] = { { "b", "1M" }, { "refs", "0" }, - // same as the x264 default - { "g", "248" }, + { "g", "-1" }, { "bf", "-1" }, { "qmin", "-1" }, { "qmax", "-1" }, From patchwork Mon Sep 26 09:36:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38331 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2132798pzh; Mon, 26 Sep 2022 02:40:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4IY/AKqFS6o2p03t3+YPAO4c0E6GoJzcnn85mhFbc8bDWj/TZU9/QXxsDO1ZimHtSBhzFg X-Received: by 2002:aa7:dd57:0:b0:453:2d35:70bb with SMTP id o23-20020aa7dd57000000b004532d3570bbmr22134388edw.26.1664185230058; Mon, 26 Sep 2022 02:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664185230; cv=none; d=google.com; s=arc-20160816; b=Dbr4KolKYNCzdLwoszohQjnSNQv6N+5Dbk2CRfQPjKZ7aI7e9E0lbOLL7EBBKTbrmD 8F2xXZ3DJ60YATgZRNGDtxM05o2cvaf6TxJrqm4lS5n49bANz7s8rk8LoWhi3XEHhdlR C/KMEHvjXHjJgnE1JoQDS6eloock/AfuWD3mPdvQmi8fzRkBdXoUXpbQ4Uta01yKWEuO LuT7bZGksU0Ue8Eb7cQn44lPupOy0Lq/jcGhjQfjLpNRYoAc/q/CjGdpS1U9+75oS2gX PX8OvaaUlPqZgJXCpP4q5dapfIG6KKdEKrN8rB7+7sP2d3z2yD7vmtMAQG3NU/ngmxcO 48uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=nuaxVfXP7KBsEcdsYRIpPrMb1gC6cJL5zlO8eNA8a6Y=; b=aDjR31NqQpAISuEhYCwXDWK06YSPc1fqbe9fvCMRtSvtg/ni9HrAmybnBBB5g6bdI3 U67NrZVfRrOZS4QT4kJ2p6fE2WdH/TC96mGUlOLM7fAj/o+1xZp33coDC4hvYXbbgrhi 7lXDuQ2xprHxxM0hcs5m1sfR/mXW1gh0rWYtpzyUu8unzDy720m4iWtwjfRpPCCrwXPG GKRcsWN17M95yiyNdTS6ir3qqvEbLXJS0e6sn3rpQgBPt4/rmZ3cqo7GfjbY+X/mmKbe 41GwFx0GCmH/eXUzeLNHdIKyq7kpErDu5V8duzBJ6FOJGug6UHzAMCzJyKsJrvML7dtb yxYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=UPKr4kdt; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp23-20020a1709073e1700b00782c6ab6f01si8878270ejc.410.2022.09.26.02.40.29; Mon, 26 Sep 2022 02:40:30 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=UPKr4kdt; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8EC9A68B92B; Mon, 26 Sep 2022 12:40: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 21BC968B156 for ; Mon, 26 Sep 2022 12:40:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664185225; x=1695721225; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=4xVwLc7GS9nx/zP4kU3mrDrzrpIs5qvRWuX/QR79G54=; b=UPKr4kdtSIdmKNJ/QAGL5xL2gZDseiDc2BOn/TJ3OR+jke9E0uH3M4t+ Qy9ftUq3ncvQrlezNSBptk77mLzWd8NFgfgOzqn8MporhdWRCbP3BGIjC /8uLORksx2KJ0JjjggxD26hf1uLKQJeIA96SMZTIlnU8dn2W/S5NcIazk i6UbbHM9Jzpc537ZGeyY60GUK0qzBcF670V1Ah/IJW4FEWZA0S17XxN7M O6O643bLFzO4CYwpBQyGrnWHvThxXvZwQPvJBjIzHQ46ELQiogywl0Voq wUgtxl2eAiDg1V7j4WSQLVbjpJw0eMfnNxB/qJQB+/LFsP15hxWXQMX94 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="284102958" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="284102958" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 02:40:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="620983475" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="620983475" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga002.jf.intel.com with ESMTP; 26 Sep 2022 02:40:13 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 17:36:30 +0800 Message-Id: <20220926093630.72758-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220926093630.72758-1-wenbin.chen@intel.com> References: <20220926093630.72758-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] libavcodec/qsvenc: Let runtime to decide targetUsage 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TL16nlFdQUdW Set preset default value to MFX_TARGETUSAGE_UNKNOWN. Let runtime to decide the targetUsage, so that ffmpeg-qsv can keep up with runtime's update. Signed-off-by: Wenbin Chen --- libavcodec/qsvenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index f2b7ee361f..4315463cd2 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -52,7 +52,7 @@ #define QSV_COMMON_OPTS \ { "async_depth", "Maximum processing parallelism", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 1, INT_MAX, VE }, \ -{ "preset", NULL, OFFSET(qsv.preset), AV_OPT_TYPE_INT, { .i64 = MFX_TARGETUSAGE_BALANCED }, MFX_TARGETUSAGE_BEST_QUALITY, MFX_TARGETUSAGE_BEST_SPEED, VE, "preset" }, \ +{ "preset", NULL, OFFSET(qsv.preset), AV_OPT_TYPE_INT, { .i64 = MFX_TARGETUSAGE_UNKNOWN }, MFX_TARGETUSAGE_UNKNOWN, MFX_TARGETUSAGE_BEST_SPEED, VE, "preset" }, \ { "veryfast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_SPEED }, INT_MIN, INT_MAX, VE, "preset" }, \ { "faster", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_6 }, INT_MIN, INT_MAX, VE, "preset" }, \ { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_5 }, INT_MIN, INT_MAX, VE, "preset" }, \