From patchwork Thu May 19 19:54:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rogozhkin, Dmitry V" X-Patchwork-Id: 35834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp250746pzb; Thu, 19 May 2022 12:55:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNMgvuLkvQ5QBWj1dEXqNygTV6Q/Z+bkFu0PbyvZg1b4hJ9E3bWwuv52kqfMZSuKDuiPHY X-Received: by 2002:a17:907:3e8e:b0:6f4:ff62:a399 with SMTP id hs14-20020a1709073e8e00b006f4ff62a399mr6067284ejc.298.1652990115505; Thu, 19 May 2022 12:55:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652990115; cv=none; d=google.com; s=arc-20160816; b=lxBG78vqtKm6FicfCES9duBVv4KCkqJeStlLoWBvbC22fAIjN9dY+EoDbPnk31H3Di od49cdPZyloRhABSfsimmx5XT8S6KhT5ub58BdOCutKgZj6YDr9DGoLBzs/tvzoH36yf PQTQKwa1xU0UzwumMMX5Gnq8jWvV24M8Yfxy559sGJNucz8MtP04nPOUFv+F+bWFUThq J/Xs811AF8Qc83GpVP5X1sXHj0gB2sQfhHKWT/gFoVZbgkxhm9otq6nq6lxB6Sio3afW p2B9ljOzdoI22Xwy1gCc9s7MvdTwEGOesqg/yjIFvHjBe2sr4oqnaVJmt/cDbPk4rGOH MQTw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=lXcmyl+FG6oQSX0pz+mHgZ+8icK3XjtHNEqVXJEkHqI=; b=fPNRnUoiJuXtKs7AaR+U+TgwUDnxgTFxpuBQZp5BNyGBsp6HeDQa2K96jlUXzzBZj+ Fl49GAaGVfvgbMyF18kUjfzOn2JSatPyl6mlTiCAoyirQep5YShV8xiuVIOqB154S8mV L7e4aiZ/XO7dp34/DowH12R8xsdZ7ZHe54+CoGvBcx6KmkgDvsrqBuGY8Eq9Q6a77oif mgDUgEv+ec+XvoUw4qoR7OAGdkqqtof5VaCiaVv+JLO6Lxu/yOXHzopoDoCpzRcooDSH X46o3GDDrfNi6kRjM1uEXxBOq1NAEE71dCqOqF527KXcqg85fWvr2aSBPGTy21OsZmPp iSyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=C1QmD1iF; 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 ec28-20020a0564020d5c00b00425c0e470e5si5336161edb.375.2022.05.19.12.55.00; Thu, 19 May 2022 12:55:15 -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=C1QmD1iF; 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 9340368B3FA; Thu, 19 May 2022 22:54:56 +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 675C668B3FA for ; Thu, 19 May 2022 22:54:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652990094; x=1684526094; h=from:to:cc:subject:date:message-id; bh=lFKLT2os+dMofAkKtzRKXhIHMHaYQZDgvjxf9JO/Ex0=; b=C1QmD1iFuxDIaiZdIxKvN8Oz4Ci01awr/cRFn2bp/KUdpyEQyjeFAr/G Nfv6YwADaxIZVGRfigAZ9b6QQRFQKw1m32Tf3HmH6dCxCckxOEUKgCrYj 40bq5hUtqRmvpVZWzCIuoSwOldyPE/1nsdKdgC/ak/4CCjnEYgI//ZM/r V/GdWkd2AL2Op873DsNfdfzvNxq9BLzk5l6AxttLB8O5hxG07e0c5ek1k rbiVkdiD6E50MFlWTNv7N+HVBKXUWT8ewkAcn/LDbxIcLyuL7jv+sIQcq txvi9s+mPylDGxpWVLoz5CgeO5mKQrMGyoHm16Ck0+8MQbh2a07QVfsEh w==; X-IronPort-AV: E=McAfee;i="6400,9594,10352"; a="254402536" X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="254402536" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 May 2022 12:54:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="743097553" Received: from dvrscl.jf.intel.com ([10.54.72.26]) by orsmga005.jf.intel.com with ESMTP; 19 May 2022 12:54:44 -0700 From: Dmitry Rogozhkin To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 May 2022 12:54:16 -0700 Message-Id: <1652990056-46383-1-git-send-email-dmitry.v.rogozhkin@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc: expose only supported options 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: Dmitry Rogozhkin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dAoKInd9eOtL vp9, hevc, avc, mpeg2 QSV encoders inherit common list of options (QSV_COMMON_OPTS) while bunch of options is not actually supported by current qsv code. The only codec which supportes everything is avc, followed by hevc, while vp9 and mpeg2 significantly fall behind. This creates difficulties for the users to use qsv encoders. This patch fixes options list for encoders leaving only those which are actually supported. Signed-off-by: Dmitry Rogozhkin --- libavcodec/qsvenc.h | 52 ++++++++++++++++++++++++++++++++++------------- libavcodec/qsvenc_h264.c | 12 +++++++++++ libavcodec/qsvenc_hevc.c | 9 ++++++++ libavcodec/qsvenc_mpeg2.c | 1 + 4 files changed, 60 insertions(+), 14 deletions(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index cb84723..33bbc2a 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -89,22 +89,46 @@ { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_3 }, INT_MIN, INT_MAX, VE, "preset" }, \ { "slower", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_2 }, INT_MIN, INT_MAX, VE, "preset" }, \ { "veryslow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_QUALITY }, INT_MIN, INT_MAX, VE, "preset" }, \ -{ "rdo", "Enable rate distortion optimization", OFFSET(qsv.rdo), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ +{ "forced_idr", "Forcing I frames as IDR frames", OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, \ +{ "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, VE}, + +#define QSV_OPTION_RDO \ +{ "rdo", "Enable rate distortion optimization", OFFSET(qsv.rdo), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_MAX_FRAME_SIZE \ { "max_frame_size", "Maximum encoded frame size in bytes", OFFSET(qsv.max_frame_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, \ { "max_frame_size_i", "Maximum encoded I frame size in bytes",OFFSET(qsv.max_frame_size_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, \ -{ "max_frame_size_p", "Maximum encoded P frame size in bytes",OFFSET(qsv.max_frame_size_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, \ -{ "max_slice_size", "Maximum encoded slice size in bytes", OFFSET(qsv.max_slice_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, \ -{ "bitrate_limit", "Toggle bitrate limitations", OFFSET(qsv.bitrate_limit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "mbbrc", "MB level bitrate control", OFFSET(qsv.mbbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "extbrc", "Extended bitrate control", OFFSET(qsv.extbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "p_strategy", "Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0).", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, VE }, \ -{ "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "forced_idr", "Forcing I frames as IDR frames", OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, \ -{ "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = -1}, -1, 1, VE},\ -{ "dblk_idc", "This option disable deblocking. It has value in range 0~2.", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE}, \ -{ "low_delay_brc", "Allow to strictly obey avg frame size", OFFSET(qsv.low_delay_brc), AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, \ +{ "max_frame_size_p", "Maximum encoded P frame size in bytes",OFFSET(qsv.max_frame_size_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, + +#define QSV_OPTION_MAX_SLICE_SIZE \ +{ "max_slice_size", "Maximum encoded slice size in bytes", OFFSET(qsv.max_slice_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE }, + +#define QSV_OPTION_BITRATE_LIMIT \ +{ "bitrate_limit", "Toggle bitrate limitations", OFFSET(qsv.bitrate_limit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_MBBRC \ +{ "mbbrc", "MB level bitrate control", OFFSET(qsv.mbbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_EXTBRC \ +{ "extbrc", "Extended bitrate control", OFFSET(qsv.extbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_ADAPTIVE_I \ +{ "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_ADAPTIVE_B \ +{ "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_P_STRATEGY \ +{ "p_strategy", "Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0).", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, VE }, + +#define QSV_OPTION_B_STRATEGY \ +{ "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + +#define QSV_OPTION_DBLK_IDC \ +{ "dblk_idc", "This option disable deblocking. It has value in range 0~2.", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE}, + +#define QSV_OPTION_LOW_DELAY_BRC \ +{ "low_delay_brc", "Allow to strictly obey avg frame size", OFFSET(qsv.low_delay_brc), AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE }, extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[]; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index b4cf9ea..a21961c 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -102,6 +102,18 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { QSV_COMMON_OPTS + QSV_OPTION_RDO + QSV_OPTION_MAX_FRAME_SIZE + QSV_OPTION_MAX_SLICE_SIZE + QSV_OPTION_BITRATE_LIMIT + QSV_OPTION_MBBRC + QSV_OPTION_EXTBRC + QSV_OPTION_ADAPTIVE_I + QSV_OPTION_ADAPTIVE_B + QSV_OPTION_P_STRATEGY + QSV_OPTION_B_STRATEGY + QSV_OPTION_DBLK_IDC + QSV_OPTION_LOW_DELAY_BRC { "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, #if QSV_HAVE_VCM diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 3a2d50e..bb4de8e 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -224,6 +224,15 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { QSV_COMMON_OPTS + QSV_OPTION_RDO + QSV_OPTION_MAX_FRAME_SIZE + QSV_OPTION_MAX_SLICE_SIZE + QSV_OPTION_MBBRC + QSV_OPTION_EXTBRC + QSV_OPTION_P_STRATEGY + QSV_OPTION_B_STRATEGY + QSV_OPTION_DBLK_IDC + QSV_OPTION_LOW_DELAY_BRC { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT_MAX, VE, "idr_interval" }, { "begin_only", "Output an IDR-frame only at the beginning of the stream", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "idr_interval" }, diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index 3f79b48..5cb12a2 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -64,6 +64,7 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { QSV_COMMON_OPTS + QSV_OPTION_RDO { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 = MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" }, { "unknown", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, VE, "profile" },