From patchwork Mon Sep 26 08:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2106032pzh; Mon, 26 Sep 2022 01:38:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM68sY5cTwUvdg/kIosyAVrOGmw105WzBuKuNoPap3UzKMovxz9Dow6id52ZzNU/Fpe9Nj1x X-Received: by 2002:a05:6402:1761:b0:455:37bb:93c3 with SMTP id da1-20020a056402176100b0045537bb93c3mr18546343edb.403.1664181524828; Mon, 26 Sep 2022 01:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664181524; cv=none; d=google.com; s=arc-20160816; b=yeoK1JAw0qFYvZGfdNZNQRMdV6kU8tfZR9msVCDt/i6IUHMBUu9jcdI6tBqwkS5teI O0qYOwPh+6Yhx+618hU4PklmyIaj4669/NAKFXDh0ovdHJKhAI9VrtaVeg+ClozzyOAv ynpe9BVfLceedryo8rPl8+dfBykq4pxIWC30NFcqDpIUaxBcvZZNbw/c+HDELOmKMXrQ WqoUvNuaQ4SDGit0a+4mfLZpOshWAWttPU5maTG7wZ5qvkBbgpEmmSaCzohhBjaUEa0J c3uyCvz1NTWfvUkv5NgG0tHGIJEPGgaQWsmUTfTSIzW4DQxy+JTgFHIAZcpuTyyg7hLy oTrw== 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=R0AB0M4JN2328Ohj54A5G+UoaiwXs7oVgdmIucyt1IU=; b=xbkp4E7/MGcjcvOrqv1aVsv+tB81/LDiBk6cUj75lvcRDSsA3rNt+rGgnpJ+qpJzLV UOHLbpb4oSdTL+5bU7X1ZkqgvJZO7uYZY36cU1bPW7fosEGGIaaxingkDa9oB86IsPZS Cam5lDhiSjgkUzmwuJc/DRxJ481XGQxAN0N1CtedPSl8/WL4rnAF1r93YCKmvJwlpJVm 9RKKuIw5Es9RK0f9MhAdiZt9NnkjcvuDT7rLxGZoWvbYYewMSWBeJPyTXLLN/G47VL45 P1oGtlnuecW57eOedL1kSpLsVbd9P+aoUqaHoTQ8gUoFx7kzR6ztJ9m5Xe5YTM6niZ/U KpYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=BHQkUeBc; 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 gs12-20020a1709072d0c00b00783c03b2322si611064ejc.695.2022.09.26.01.38.44; Mon, 26 Sep 2022 01:38:44 -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=BHQkUeBc; 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 3308468B9CD; Mon, 26 Sep 2022 11:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6765A68AFF7 for ; Mon, 26 Sep 2022 11:38:34 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664181519; x=1695717519; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=3BK/dHrrXj9iMeEJSoHpbPAO3bqVyhGzNYMY/5GPZQs=; b=BHQkUeBcSFTdPWufYe+kSO2rUZ1fL+7u2qy3ikjPfI3maHDHYQCYRnXx DMxF4j9NDqUVCGt15VeaXnyolAfRMBc+J8zNthNEGsiiEeknuaLvznehl 5FneXZ/HvaI/NrJ23sIyk1RzoxxRRMAl6pyoyXl1psX3g81JtxjB7Ys92 bL5wcSAFOJ0ZtvxNEnA0ivO1kqw2X7He+u1tFx9y5dWCLBpvGju7UjjDv +pyibiDKg25woZ6EmUx7pvW9dGJhMxAW/jdWQCdVz55PV+7PCCd0XkQ+X jeV95HsFRwfH1ij3/EsI4+rKoxa9cfrPaB8htBsjrIhq/HDJQuUATj6Zv A==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="302443630" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="302443630" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 01:38:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="598650930" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="598650930" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga006.jf.intel.com with ESMTP; 26 Sep 2022 01:38:31 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 16:34:48 +0800 Message-Id: <20220926083449.70287-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: ZSSmm17T1tVg 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 | 4 ++-- libavcodec/qsvenc_hevc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 85826ae4be..fe777a6ae3 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -177,8 +177,8 @@ 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..0c5bec231d 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -290,7 +290,7 @@ 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 08:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2106093pzh; Mon, 26 Sep 2022 01:38:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/vQst3bK1RFf+pvdG7+KS6rxaWGLDwenVC4aUCbBRwtONWq4q+l2/lgWztWnwGGPE/m/R X-Received: by 2002:a17:906:cc13:b0:77d:46c2:f37c with SMTP id ml19-20020a170906cc1300b0077d46c2f37cmr17185657ejb.45.1664181533272; Mon, 26 Sep 2022 01:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664181533; cv=none; d=google.com; s=arc-20160816; b=PLMb5wYSdR4l+OT7TZurrAyZig45+/EmvTRYvdmqKf2nBNQ3RHhPhhMCEOPLPTcvCg rRQn0aX+d1LHsP/AdPgrfxLIY8mctGJ55/LxyinTp0tGTuu6nhNV6rJrSin3oWhVzY7U PKUDRnnsNxKkY7NiLl49Jx8Au3mx0z8j79D+JvDYq1n8aidKdOKVV24stGviqhoD2NTZ gb1lgwkeDvm9bYALSDQ7R6D3IUBn4ypdV5pqwFSZRUxVTD6dDEkOjQ1eXNWwqXSwOOwZ dvm3NDgN6lJ4riKcWcQHuPFbmVBvcqUk7wlZnB3Ru/N+Opxs5gDSc3/K52YemrX5HDub RIzA== 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=NTzzWRNtdcyvNI0p7wQz3SyAEh1vryKxQ4o9L9/jqtG1eX8LCnneayjFG/9Eqg6BpA u3wmWPXnZBoLUIHNkUWo/KgY4MBXlizIHPujryW7DHIfrenFXeNVqtvIxLsi308lCE3L agFO/kVuf004cfcvG9YRfS4YVK9Me+YUt2YgYoK1qfDQh/lQ03k1ixnbysUEqW/OYbSl Cqx9/c+jmB0PHSgWOEKv9P/4vWkgCWgwpm7HkcxcrW6/zqz+ShPXzLLC2sSkFtsilS3O npEXVXJ/wfxWjONF+IZBD1q03z2nb9CSRvl9WoCBOd9uT8gm/JT50Jfxw7fwXniPailQ l6vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=FHRUIvGf; 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 f17-20020a0564021e9100b00450f56cd37bsi17925908edf.175.2022.09.26.01.38.52; Mon, 26 Sep 2022 01:38:53 -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=FHRUIvGf; 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 1107B68BA5B; Mon, 26 Sep 2022 11:38:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E418E68B752 for ; Mon, 26 Sep 2022 11:38:36 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664181522; x=1695717522; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=4xVwLc7GS9nx/zP4kU3mrDrzrpIs5qvRWuX/QR79G54=; b=FHRUIvGfDNhzXIDkakJGfH4O813Vm33MKzgRL9l5jlx+4/l3L42nw5V0 G9mUxGnrFIZCzZfUUQCnVl5lC3RDpPM+EQAIobGJA406tjdugr0gusXku capLaYM+lznkmbRTWmEP/Le6FButueilNAVXDaTlKKAHS0zMlZB05qNEX tABKQAvKdw52e56LbPor2b8bgwIcFa+cxeSUUMzYRL4vQVEiKeU3KsNJd 2daQlQ03bjfE+jZzCPIgWYsfGkVrF8FKTB1pO/6JCqmZdm1BiinPA5qpI Ycpv7aQsFMnPYnREMpdMF2Ewfpz3jBmsD40W06hpHSqvbZROF1uLnNRtP w==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="302443632" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="302443632" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 01:38:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="598650932" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="598650932" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga006.jf.intel.com with ESMTP; 26 Sep 2022 01:38:32 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 16:34:49 +0800 Message-Id: <20220926083449.70287-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220926083449.70287-1-wenbin.chen@intel.com> References: <20220926083449.70287-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: DAHWGXE0SllL 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" }, \