From patchwork Mon Jan 17 05:11:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2453782iog; Sun, 16 Jan 2022 21:12:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxeSAPGaK597JUMm9PkvQtkqCmwaEfjUHBibrAqnSvCWO6YiRdj2bCSpnuL9eArYupmIgHZ X-Received: by 2002:a17:906:7c4:: with SMTP id m4mr15289549ejc.655.1642396377469; Sun, 16 Jan 2022 21:12:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642396377; cv=none; d=google.com; s=arc-20160816; b=frWP9qI7Ol2Uo97oMlm52js5Tl7zN+Py6J+bTuA2k8kw1mwJYLDenmvu1bROLR29ak 75l4sjiHGFhzSgBX/2JV4/pX73/73nvp25HseXWSjGDRSl2KDE9kUzx1YkQE1cqLVunQ kSochhrRMHJ5gIhjBWIJw+s4hLRBYXwWpejdXSgP95o0293Cvmu5YMlJNwmPwD9C1Vm7 CPas7tOFqaCBOfN3wocW1UGkVbyoMwdgZY80o0Rtp32Lzkk+mdIfM4dLanG+p1C8Le0G D80eEsKWKqOsfT2YYJ/Ro/Zmrouxs8H5PZV79is3Mtw5QieXJAoTLYuHb3APn9g69vQv B4WA== 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=CB7pdnfm95joWHxwGDFFXu7yLfNZ8jmQPNcOgpp9Ga4=; b=odbBiR8yyDa42U4NJxvP8e1710mlaGDwAiOxcmzaVR/b892vEqJSnfqm6msuSUJ9rZ BJU8xwIHQ5xDjZ7WByuI1lrv/7lHIsye5r6b3qMY/aAmXRPeDv2Mvu3KtP5K8b2CB6Rm okr3mi+mASuREAsHCUq9xdl6ce2d4day8cvLYQM6IV770HrEI3CJ1Jhkjt1b0E0k53W8 BFOMfWSORI5BLnkfkNl1T0mAy9xj0GJOIqlDznfLptyE1nirVhhVq2dfubxC7GuEz+jS 2U2XB1mYK8eVbBSZyEhwVqTgmLUJmg8HVWYjTFAwjQLZ3tIZTJOHr4EWdz7croF8c+4P dGMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=U8SkYfsY; 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 z7si7770038edd.76.2022.01.16.21.12.56; Sun, 16 Jan 2022 21:12:57 -0800 (PST) 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=U8SkYfsY; 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 0F9CF68A62B; Mon, 17 Jan 2022 07:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C18868AE9C for ; Mon, 17 Jan 2022 07:12:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642396370; x=1673932370; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=T6aGtPlM4FJwhVKXDWlmYSBz4uY2mGRV+YXwNdQBJBI=; b=U8SkYfsYRJoAhkQWYMHaogKnDgux91kOI+xNer1oaUoJkjJlpib11x2N u3faCmRgdhZwwjuEak2lkB2LHZ0Q8NsMWc/k/DbM6slFqwpd2VxDjO0jK t8DAKp7dPe63yTeODj2X0bDGDMP8OUrlraYXN9H5ihcHXTISUJ87sFc2X 2g4JugwrQ5mcMyQR0mzkEq6kkgqRYqqBRNYlV9yjRbPqhIIQPAumOfISy ATLiVYiWmWug5GiNpftvf6/AiuvqgmmCqi1qNqUMxQpn4DAkVJEDzsD25 QEuXqbRaKk20fkcuYnD+MPOVFlqpTQutzBK0mHPJuA+ex+CB0YCyGgRsB g==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="242111658" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="242111658" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 21:12:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="517278345" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 16 Jan 2022 21:12:40 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 13:11:19 +0800 Message-Id: <20220117051122.628422-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V5 1/4] libavcodec/qsvenc: Add max_frame_size support to hevc_qsv 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: dO5FWsjZjk8P Add max_frame_size support to hevc_qsv as well. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 7cc8be1209..68921fbd40 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3388,6 +3388,9 @@ intra refresh cycle. @item @var{rdo} Enable rate distortion optimization. +@item @var{max_frame_size} +Maximum encoded frame size in bytes. + @item @var{idr_interval} Distance (in I-frames) between IDR frames. @table @samp diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 4e7a15f060..b3728d28d5 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -859,8 +859,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (q->mbbrc >= 0) q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->max_frame_size >= 0) - q->extco2.MaxFrameSize = q->max_frame_size; #if QSV_HAVE_MAX_SLICE_SIZE if (q->max_slice_size >= 0) q->extco2.MaxSliceSize = q->max_slice_size; @@ -889,6 +887,8 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_HEVC) { if (q->extbrc >= 0) q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + if (q->max_frame_size >= 0) + q->extco2.MaxFrameSize = q->max_frame_size; #if QSV_VERSION_ATLEAST(1, 9) if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { From patchwork Mon Jan 17 05:11:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2453875iog; Sun, 16 Jan 2022 21:13:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0iR63V/P6XHAQN4rR/9jBiTGz9x9ddy3na0DyQa5V6p9Gx/DKNVWvh2WvFES5Vm3nZojs X-Received: by 2002:a17:907:72cb:: with SMTP id du11mr1650119ejc.703.1642396388611; Sun, 16 Jan 2022 21:13:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642396388; cv=none; d=google.com; s=arc-20160816; b=gtCbBwhTMwzaV+H/UxOilLaF1LytQyjtXUotcyfFiG/Kkc9uE8dnOotUUD4GQSVilj scfMUQW2iNV1vDKrwhp9iWdaD4ZcBXGqBLH0Gfo/8bHnnbHy6HBA23okBuEKKWMix4i4 fSMjfwLgPrB4V7HKuoVeG+Brfq+AWdOj+7VlAQNXQBXea9Dj3bG1ah4PsglXCW3O3sBT IRO03qs5ihBMObFwlETPtoqRECl02LRjYxxknwcs2f3LSFnqAMgnAWkZ4k4NeJUgCfB7 1vJyEtz3qgwY9Qi7JmxcdVikBPtJDb0jKmnwF5AFj6wTbz6VQrESVf3ArSXQBPmHse7N cl/g== 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=zDblUfaUWkduXok3dRcQb/Hu6F8xx6gHxZxHewQVR0s=; b=OrQBg7Tk400MKdr/zmLRapk0lTe5LUSj+UZq1Rsz8OrNN67KaHApzFQfvDnV/uBVbm OhsrWRu9j950p2SemqTdeXA4LAYpryMZvEnXHL9i0zSYHwIu2XGWpC5dHkvJokD0W3SM z3hOMdfePe1bYqCC81FDRega3OvaXW4TFkPwBUKeWGLNziwWcMM0u/hg2acj0STqOMQm 5WO9yASgH+ciGmk2EPIjz/Sn8j8XzKHKJSDgPepkNpNWAT1b3N1g2FEzx9vOiHPy133y HMz9JIdxYpp7yc/C4dVNQB6HG7gufF4Be7VY4PBy6QyQZyXV9UQnPhjvDV+V3eiBoZay kNaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=dbtNem+N; 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 u7si5405330edd.562.2022.01.16.21.13.08; Sun, 16 Jan 2022 21:13:08 -0800 (PST) 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=dbtNem+N; 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 3004068AF5D; Mon, 17 Jan 2022 07:12:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 630B068A62B for ; Mon, 17 Jan 2022 07:12:46 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642396371; x=1673932371; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=jkJeUzTPcYOOK21owa9GY7LpexH3i1aR7W9WnDtBFog=; b=dbtNem+Nll2CGvKvyIi1uxQMYoA4/CGCWvgAGomMItgznVDc2njYMp42 YOPnZPD4FR6sVuxGXbIxSq/ph+akUZ8ZitZhqV9VhCiUqjXV6knGficS9 YL1mPr/bK/pTsTc4rq0cFkCW5lw059CliGHll3Tm9GMEwqTkfbq2RX5u5 6W//FjwJv+qgxpGKxiyY4hp3PFtdbER/AEwn1NDqmFdN02kaq9cQSHep3 tOBRLomEBP3PGmU7tGBHm5b9opa58VeAUCaV2T+inFltuQ6EdU2ckABxE x+m/WJInKbaljdKqjN2RmUitmHY+Nk6xDHhhaG0GdG3SDRfegE3xLTACP Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="242111662" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="242111662" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 21:12:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="517278346" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 16 Jan 2022 21:12:41 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 13:11:20 +0800 Message-Id: <20220117051122.628422-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220117051122.628422-1-wenbin.chen@intel.com> References: <20220117051122.628422-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V5 2/4] libavcodec/qsvenc: Add DisableDeblockingIdc support to qsv 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: MK/DJwB4Z7wd Add dblk_idc option to 264_qsv and hevc_qsv. Turining on this opion can disable deblocking. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 7 +++++++ libavcodec/qsvenc.h | 3 +++ 3 files changed, 16 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 68921fbd40..6fc94daa11 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3299,6 +3299,9 @@ This flag controls changing of frame type from B to P. @item @var{b_strategy} This option controls usage of B frames as reference. +@item @var{dblk_idc} +This option disable deblocking. It has value in range 0~2. + @item @var{cavlc} If set, CAVLC is used; if unset, CABAC is used for encoding. @@ -3391,6 +3394,9 @@ Enable rate distortion optimization. @item @var{max_frame_size} Maximum encoded frame size in bytes. +@item @var{dblk_idc} +This option disable deblocking. It has value in range 0~2. + @item @var{idr_interval} Distance (in I-frames) between IDR frames. @table @samp diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index b3728d28d5..e18a96e216 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -346,6 +346,10 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, av_log(avctx, AV_LOG_VERBOSE, "FrameRateExtD: %"PRIu32"; FrameRateExtN: %"PRIu32" \n", info->FrameInfo.FrameRateExtD, info->FrameInfo.FrameRateExtN); +#if QSV_HAVE_DISABLEDEBLOCKIDC + av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2->DisableDeblockingIdc); +#endif + } static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, @@ -889,6 +893,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->max_frame_size >= 0) q->extco2.MaxFrameSize = q->max_frame_size; +#if QSV_HAVE_DISABLEDEBLOCKIDC + q->extco2.DisableDeblockingIdc = q->dblk_idc; +#endif #if QSV_VERSION_ATLEAST(1, 9) if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 31516b8e55..08e902be74 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -44,6 +44,7 @@ #define QSV_HAVE_TRELLIS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_MAX_SLICE_SIZE QSV_VERSION_ATLEAST(1, 9) +#define QSV_HAVE_DISABLEDEBLOCKIDC QSV_VERSION_ATLEAST(1, 9) #define QSV_HAVE_BREF_TYPE QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7) @@ -97,6 +98,7 @@ { "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}, \ extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[]; @@ -169,6 +171,7 @@ typedef struct QSVEncContext { int rdo; int max_frame_size; int max_slice_size; + int dblk_idc; int tile_cols; int tile_rows; From patchwork Mon Jan 17 05:11:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2453957iog; Sun, 16 Jan 2022 21:13:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOk6j/7J8YWmfFwYxkD8rzouC2SDXcn7LXL/ezeJ/h0YcPcPTSn8CFHtQ3lXq6Ut8vKEij X-Received: by 2002:a17:906:a893:: with SMTP id ha19mr15055793ejb.144.1642396398189; Sun, 16 Jan 2022 21:13:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642396398; cv=none; d=google.com; s=arc-20160816; b=kURSmIy9UvkHx2rwCDgww5PMFGry1csqMjcUVwRIUMnsT56qwH6/vBBHvGeZNJowuj Fvl/mr+tCPEaRpQNk/02kiM2Ds0ZvwYhlBrnXFavXY3SgWME6igliv4ZXSHdq57ynGZE cro/f9+UVCZ0lWHcSn0Qk2y+GhmGW1BoJjD4479fCE0GTuPshgmQFTQ+Q2BLjBJhNF9I uBlcFV7H/5VLny2T/nWJmBIe6T8SZnHUf69m8GaJritjtROUom2m4S/xlgEU5HYVSS85 ZmQB3XM9aNI0bgamBvmHQ0KM6bgIhpFr0BOCax36S3FZ0gfyuA9dGMI0s0oZjN1Bp3Fm LNAw== 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=KnwFdrzqeWAmM9aTyJpLtUTlcGFN4jhKfe94Uvv6juk=; b=ia8TVWb97tJwwHLpChNTz2H4SqfVr1/kG+ZGkZdJGxzZabeapmA0n6k7Qo93og+rvX Svo9h//xypXg6HTjWIDciLc+cUtU1FR0dS8iWe66uXy3uvtRcIjw2jT1D/vlEcxR6Ie5 nwig2CRPR9BUyc/qS7yIVQkj+ZoLo3PJPsgz6nmZL7qUHedQ404jtAsDKe0GHAxNsipw MK876J3aOS/meheAt/DfQ02vue2u/EIdCgZwjq1sQsIF5YGOAYJWxc2IwSvo1wp2iMxR nzsD06aPJnP0PlPlYSm7UyU9cRih4SXPtBaMEMcsjI5hlvoAucfYiEtJUe0nvRF5If+M 6ORQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IS4cayPx; 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 js8si1725371ejc.285.2022.01.16.21.13.17; Sun, 16 Jan 2022 21:13:18 -0800 (PST) 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=IS4cayPx; 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 34DF368AF71; Mon, 17 Jan 2022 07:12:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 132FE68AEE7 for ; Mon, 17 Jan 2022 07:12:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642396376; x=1673932376; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=BHW46glxYu4Zrd/J+xlyPVOpY0M+oWLfqtOpJmPfY6A=; b=IS4cayPxwWxkBXAQTPQcPtHbvrZHToMrCm9dQ8PtdzIjrgpypPc1Ieud 97ar9OGmM+M8vyYE2akyuwJYytI3+TyK88X6py5B/37fwmqZVX7HBtcpz X5ggc0qaLz7TStr2G9EFMoGru2tdvIzYNsCel7Pf25OP5ftklMV5EUoXn Lbp/+Ku10034Q8sA8A/QDguT6d5YG03pBZjaRwhN1UdfhgfWAgnp2kKHN ryT+wfqFkTAyeLKiSULZXHL57cU8yu1wWLmplcsHy2TyvKtCVV0bXmJwz u8DoP2TWPdSSzL/LOi91RU8zwN76SF04nJE/kx/rhr+nx+tTFRsViYWgw A==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="242111666" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="242111666" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 21:12:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="517278347" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 16 Jan 2022 21:12:42 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 13:11:21 +0800 Message-Id: <20220117051122.628422-3-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220117051122.628422-1-wenbin.chen@intel.com> References: <20220117051122.628422-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V5 3/4] libavcodec/qsvenc: Add low latency P-pyramid support to qsv 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: fnR9PhpcvwIA Add low latency P-pyramid support to qsv. This feature relates to command line option "-p_strategy". To enable this flag, user also need to set "-bf" to 0. P-strategy has two modes "1-simple" and "2-pyramid". The details of the two models refer to https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#preftype Signed-off-by: Wenbin Chen --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 3 +++ 3 files changed, 45 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 6fc94daa11..3d7c944fba 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3296,6 +3296,9 @@ to allow changing of frame type from P and B to I. @item @var{adaptive_b} This flag controls changing of frame type from B to P. +@item @var{p_strategy} +Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0). + @item @var{b_strategy} This option controls usage of B frames as reference. @@ -3394,6 +3397,9 @@ Enable rate distortion optimization. @item @var{max_frame_size} Maximum encoded frame size in bytes. +@item @var{p_strategy} +Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0). + @item @var{dblk_idc} This option disable deblocking. It has value in range 0~2. diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index e18a96e216..f16082c320 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -315,6 +315,14 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; default: av_log(avctx, AV_LOG_VERBOSE, "auto"); break; } + + av_log(avctx, AV_LOG_VERBOSE, "; PRefType: "); + switch (co3->PRefType) { + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, "default"); break; + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, "simple"); break; + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; + default: av_log(avctx, AV_LOG_VERBOSE, "unknown"); break; + } av_log(avctx, AV_LOG_VERBOSE, "\n"); #endif @@ -933,6 +941,34 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) #if QSV_HAVE_CO3 q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; q->extco3.Header.BufferSz = sizeof(q->extco3); + + if (avctx->codec_id == AV_CODEC_ID_HEVC || + avctx->codec_id == AV_CODEC_ID_H264) { +#if QSV_HAVE_PREF + switch (q->p_strategy) { + case 0: + q->extco3.PRefType = MFX_P_REF_DEFAULT; + break; + case 1: + q->extco3.PRefType = MFX_P_REF_SIMPLE; + break; + case 2: + q->extco3.PRefType = MFX_P_REF_PYRAMID; + break; + default: + q->extco3.PRefType = MFX_P_REF_DEFAULT; + av_log(avctx, AV_LOG_WARNING, + "invalid p_strategy, set to default\n"); + break; + } + if (q->extco3.PRefType == MFX_P_REF_PYRAMID && + avctx->max_b_frames != 0) { + av_log(avctx, AV_LOG_WARNING, + "Please set max_b_frames(-bf) to 0 to enable P-pyramid\n"); + } +#endif + } + #if QSV_HAVE_GPB if (avctx->codec_id == AV_CODEC_ID_HEVC) q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 08e902be74..a8807e9d73 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -51,6 +51,7 @@ #define QSV_HAVE_LA_DS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11) #define QSV_HAVE_VDENC QSV_VERSION_ATLEAST(1, 15) +#define QSV_HAVE_PREF QSV_VERSION_ATLEAST(1, 16) #define QSV_HAVE_GPB QSV_VERSION_ATLEAST(1, 18) @@ -95,6 +96,7 @@ { "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},\ @@ -187,6 +189,7 @@ typedef struct QSVEncContext { int adaptive_i; int adaptive_b; int b_strategy; + int p_strategy; int cavlc; int int_ref_type; From patchwork Mon Jan 17 05:11:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2454061iog; Sun, 16 Jan 2022 21:13:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcxpCfXBaTntLaKn17QWv0mHNhobOertMLDzgHR6toiPaOmROiehyjDNY7xjzPb2efL5SY X-Received: by 2002:a17:906:9bc4:: with SMTP id de4mr11149933ejc.78.1642396409115; Sun, 16 Jan 2022 21:13:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642396409; cv=none; d=google.com; s=arc-20160816; b=dCdRHIZDbQKJt4q8D0lcjqlC3+ZJYhZgOHsjGBFqRiA0Ofs5+1Dz6WCMoLUv87d8x+ 1pbWPbh9Vt7sd4E59dejUzWi+0marZBSHPAq1sXUDPdN0fgPBVDvteSlOQAyY7/QhfjA 35oTKyrqSod/+gg+CY9/tNPhkzgDAe1exRg4MuOft1qq2CueQ8Sj14/FIz1icsgBAQMw I6sc5LRD7T8ATIU5CVWkA1oTFdbjQFIgJpmhl8yrVxfefs9Z4D/7jXavlAjcLXK9DDv5 Fc9yaFiRHHaoa3bvyMVpXLp/sc0niV4wOco38kXBvllk8u1n5rL17NCBPVgjd36zuV38 GZdA== 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=m1Zhk2kTXTzqvbHymhsoHEN3HiTE7NLjPZmrZSw41uA=; b=NzWU+y6FdzhQTq+syWMF5MQJKFxwJM9dvZsJGD+DNkMf3xHqrmaec9+DBQfDztEKPK q0y0x8PDpdsIGIRMksY3BhVZiqKuq1mE3mrkW3jDjUzd6tJQiDIYr6l6Rex8XzBpMiaY rzr7WoZNWPyv3EYaeScpDNCgeX/vaiMQR8Qo08ORcp8qgPVfwqhGoymqwfMlWoQbPH/E 9qJETQG3kF4df9jCZJOadbkhKzGGgGi6zSzWpnYH1PCuW/dckC3h+GPB+YFJxLZmwPXf CjU2/F2O1ZYGrk8TRk8YKf4eLVadewjwUMWlBZ6Y4JBJmeEHW3k79Hsrw2nMwlr6AQ4A m6zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=YQbtR055; 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 i2si1259503ejw.719.2022.01.16.21.13.28; Sun, 16 Jan 2022 21:13:29 -0800 (PST) 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=YQbtR055; 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 5AA9468AF69; Mon, 17 Jan 2022 07:13:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 486D568AEE7 for ; Mon, 17 Jan 2022 07:12:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642396377; x=1673932377; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=99Endm58F7RUw9MPK0iWzPS31OCyTmn+pl4bZQA0p8w=; b=YQbtR055gL63dalc8rb0DztqzzBAxn9c91E9MZlE1PT6CpCVO0szfIRn L7BXkaKlnRWLI+iHSz/VfE8LhyHHxBphIAS3ZG4CB5o4DzjZLWYq3T28J 5RgKahkkgZZ2a8xtEd3lJeh9BP+R7qThdmiXwcgu/a3MGCil0MsmaukFK IjHwjXRWFCSBCqM/Mb58oF/+c2CjpoVRlOeNoJSCWF+VVlmjT3wfE1BIF 0CbkpVWBV+kLJAIcYhFPJfOahpooqc2nRxlJlQmSWlDIQIa45aDhcZGLm lQPozgOGc1MCuLOLIk9MlmATBAId/nL6Lf3ifMUIYxnH3b1PFP/T19ghi Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="242111667" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="242111667" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 21:12:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="517278350" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 16 Jan 2022 21:12:43 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 13:11:22 +0800 Message-Id: <20220117051122.628422-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220117051122.628422-1-wenbin.chen@intel.com> References: <20220117051122.628422-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V5 4/4] libavcodec/qsvenc: Add transform skip to hevc_qsv 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: wq5nXyAhSz4M Add transform_skip option to hevc_qsv. By enabling this option, the transform_skip_enabled_flag in PPS will be set to 1. This option is supported on the platform equal or newer than ICL. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 4 ++++ libavcodec/qsvenc.c | 13 ++++++++++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 3d7c944fba..66e4753c2a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3447,6 +3447,10 @@ Number of rows for tiled encoding. @item @var{aud} Insert the Access Unit Delimiter NAL. + +@item @var{transform_skip} +Turn this option ON to enable transformskip. It is supported on platform equal +or newer than ICL. @end table @subsection MPEG2 Options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index f16082c320..5ffe06d364 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -358,6 +358,9 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2->DisableDeblockingIdc); #endif +#if QSV_VERSION_ATLEAST(1, 26) + av_log(avctx, AV_LOG_VERBOSE, "TransformSkip: %s \n", print_threestate(co3->TransformSkip)); +#endif } static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, @@ -969,10 +972,18 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) #endif } + if (avctx->codec_id == AV_CODEC_ID_HEVC) { +#if QSV_VERSION_ATLEAST(1, 26) + if (q->transform_skip >= 0) + q->extco3.TransformSkip = q->transform_skip ? MFX_CODINGOPTION_ON : + MFX_CODINGOPTION_OFF; + else + q->extco3.TransformSkip = MFX_CODINGOPTION_UNKNOWN; +#endif #if QSV_HAVE_GPB - if (avctx->codec_id == AV_CODEC_ID_HEVC) q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #endif + } q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco3; #endif } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index a8807e9d73..65f035045c 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -200,6 +200,7 @@ typedef struct QSVEncContext { int repeat_pps; int low_power; int gpb; + int transform_skip; int a53_cc; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 08aba3011d..679c09c858 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -251,6 +251,9 @@ static const AVOption options[] = { { "tile_rows", "Number of rows for tiled encoding", OFFSET(qsv.tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, UINT16_MAX, VE }, { "recovery_point_sei", "Insert recovery point SEI messages", OFFSET(qsv.recovery_point_sei), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, +#if QSV_VERSION_ATLEAST(1, 26) + { "transform_skip", "Turn this option ON to enable transformskip", OFFSET(qsv.transform_skip), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, VE}, +#endif { NULL }, };