From patchwork Thu Jan 13 05:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132566iog; Wed, 12 Jan 2022 21:14:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSMsGvog6eRlX/hkom5DCC1TzxzDC3+7/nIUrC0RzzWjedSchGQGF1T7L9mOOvaXoycAIG X-Received: by 2002:a17:907:b1a:: with SMTP id h26mr2249720ejl.175.1642050855557; Wed, 12 Jan 2022 21:14:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050855; cv=none; d=google.com; s=arc-20160816; b=NYVO0IlWCErgdZMOrls8N3qjtl4qBweLRXdzvMo/kANlu05pNeasddcxRnlcraqyD/ cSwG8FCemfbKw7SAzrbbadO3+XQXT2Oa8U9DjI1nC2GjUmLMkQy4zLR249hSXjhdDoKK sYTnKTqgoWs7z+IIkWCk5Rtx6dEV6w403eW34Q3KrfjA7jzCLkd8OBL1jyTJ4Uns5ack HbhuQWl8t6d2q/UNsBHxu5jJ6+d/YXQDg3wrs8xRLwJkMSVmVa5qTpQ5UQRBvQm0yrXf nQdy71zjn8tRfDMDJbfl4r8h6LXCY8+PlCrO1A8lWSLz+mjBO7dOzinHScxcGshcHpud /dTg== 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=MkwxIIZSjKzgJ08XhJevoqxTDoUDuDT8RvBVv3PWFVdIxwqPZfOVJ7E6ymD6/5JHch nf75HyQQ5ijGMpV8Gb58RjAzGGw+GVRTtonVgI04nLh5gpUG0IC/aqXVxOP5fDIsOAbX rKD+9t73M+Xt4idlX2TcY3zlqJ4efudnCXO69DHsxUbaXdPkrTI5EgWLPuXHSVG2JTuK r9H591AoqDQemHXK9T1BxZkq1+qZPIMr3y7fPbKKzQ5/8BbM1JsNN2nx/5nIL7qLZY3p 0Z7xx8jjrksDmDjajg3no1LHp/RzcPTOpP3FP0GwJkFmTUlrLDMnlPQqYZs1NxT9V23G 0fQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HYGChdsx; 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 g3si1237893ejt.101.2022.01.12.21.14.15; Wed, 12 Jan 2022 21:14:15 -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=HYGChdsx; 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 17F8168BB81; Thu, 13 Jan 2022 07:14:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 351F668B394 for ; Thu, 13 Jan 2022 07:14:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050851; x=1673586851; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=T6aGtPlM4FJwhVKXDWlmYSBz4uY2mGRV+YXwNdQBJBI=; b=HYGChdsxrB/8KpOd6KUjJoVol1PEIfVTKyp+sSa0Glp0tIRRVHE1L2jt 1jatpBV/hIu06YokBhzdE/XHgBa6wUtAyTrwjKC0QxbsDrTWwFSAnaGZl JN8FKr+ZUDohjENZaipO/7HRjEY5ycJttZY4hSXBCaND0hauLzErlinHG crp7qlLzYnyYuB3dt13LYz2cWNsytkHfU09BfbEnYhDF983jd9lQ+q/Wq clUO+J5zwLkcMXsnQNSjLpaEP9BMfwj+gxyYWuDOWyrqTO4BCjEskwgcS nqGAr9EEvvfMi/61yYXQN8RSa6HwRXToUQI6zutrFeK2Ic2+6R7DHRUvg w==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138122" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138122" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736713" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:40 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:18 +0800 Message-Id: <20220113051221.66453-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 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: ePFydz2Bpt8m 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 Thu Jan 13 05:12: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: 33543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132646iog; Wed, 12 Jan 2022 21:14:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPcAibHcX3NTanV+HQB82VKrWpA9zEdiIjM45V7nCiSJV14xfH9rIyznYmJnkYaLC/WbWs X-Received: by 2002:a17:907:3fa0:: with SMTP id hr32mr2402173ejc.196.1642050863598; Wed, 12 Jan 2022 21:14:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050863; cv=none; d=google.com; s=arc-20160816; b=MxGwmdIauSw2VYZnr/7qfuQr63NBuPUllXYB/DpRn1zqMjZNW1uM3DN+IseDsBEa4P mQNrA4YqzpazTpDzSQer/MOSh4GjdtEqgsOMO3cYqcuvJy5ikJWwIuYU+ND8nAge6fYO A82LmbvSF51cUmxIq83sVV5uzGTFNAGzH6gynWKbEj3wcSa9pzNH5cx6Vf4DRob6WjVG kdNoh1DKlYZKb3FgRiXJXyFZe+Pod0tCWaS3aBbOCJjzQGXywLoAybBQ9AzL2pUESVhC C3KLjbeT+F/p09RNBnfwg/nVEHgl+nHxtgCnuwYmMSzjPJyxu6aAqPJGQSEoNNYrNpLi Nkwg== 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=kSVq9/7RhvyTWWLEIVzO58uvzVL38QqyEbbjsMr8N9k=; b=jcCf7E/44bWZl5VJZN8uuLMfXQ2l3E/9axHud73lR3CRmbhpBzQ1aErH3mkfkXltAH 5u9PAkw9OG/QX6/Px08LgEBEzBNO7fZjXq/kgg8VBcWLPZg4JpqqcOQXECpUy7JbXNHe XzfNlBQaeBE1/sgmZrTBhRWYWSRPgEUTQcKJBgQvMhp0+FPep3NvldqhnrOXsCwDOCOr Bb7l2cT5oq6G4zoAcWnfzEl3dZalCaWRX1HWfc8RmmKULDrAQ7FpwbPnA0Rt9qwSHTww rggfljOmM1aowI4bZ/rPGpTh+J3yVkYsvNTjIvKFMOiGuQATdgIWb//B/lDRAtbLxKMo 0FNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=cPCfsZOz; 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 c3si923314ejb.890.2022.01.12.21.14.23; Wed, 12 Jan 2022 21:14:23 -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=cPCfsZOz; 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 F2D4268BB8E; Thu, 13 Jan 2022 07:14:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC92C68B394 for ; Thu, 13 Jan 2022 07:14:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050852; x=1673586852; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=AW7Msj7QlQX9MI1VfUG8tQ2uPXCmQLCtssAzywdfFgY=; b=cPCfsZOzkhV/WYNIvZbrgjPVTiWBSEkv8j022+ombT3lmRswqPC5qjTU pmzOLbOY6jRbngBq3l0YO0yi136u5lwvaz4nz22cgfontv2T5/8c/YUB2 lj7Tj18+2nxHh+Zjf7JxWVY8/a+n8kYE25U9vuDFq2Mmp14jeZDyVy7rZ RBiKbUt9dKa3tvHqfKtdb0lMbE1nGLv2I0VAL9hUwzHov4mdbFX7AyeSg 5paKNFvBlTbE3i0MLHbcMpxsZ0FojiOE8iJUy5EEc0E6cXQi4/Jyt5/KR fib7FnUhHb4MSQK/GLkoc5lvCnptQEoUO2NdvU3Nfww9F/UZuK6VbSbQ5 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138127" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138127" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736718" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:41 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:19 +0800 Message-Id: <20220113051221.66453-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113051221.66453-1-wenbin.chen@intel.com> References: <20220113051221.66453-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 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: 1DJ5FR+chjfn 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 | 8 ++++++++ libavcodec/qsvenc.h | 3 +++ 3 files changed, 17 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..e87b69369a 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,10 @@ 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 + if(q->dblk_idc >= 0) + 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..aa49b35f07 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 = -1 }, -1, 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 Thu Jan 13 05:12: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: 33544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132743iog; Wed, 12 Jan 2022 21:14:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3xk8nOiVX2U61jGNXcg8XY3Gk0t7g4WhnJNTlM5pabYJerBYyEoTb7QhA8tYWtRMd5iBu X-Received: by 2002:aa7:dc07:: with SMTP id b7mr2593555edu.327.1642050872468; Wed, 12 Jan 2022 21:14:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050872; cv=none; d=google.com; s=arc-20160816; b=cshoaJMclmU7lG5yoXg/5CJT53hxLKHnRGyYsm7/PW42LN2GCkLenTHenXRX25nSw6 KF1w+xojADf3uSZlu46qEMae2p77Cw4+48T72Zx0Na08j3riY4YOv2MolrZBd/efEY2/ 78kGgrwLxvxOSz4l1Uv+CIXp7NczllwkgMYiKXkXMush1jV4+1/RvZdW2JnAXmH5ygeB 9hLCN4CF1Pl/nDT3UCDeuM+wzj3VGYIG03hFO8JpJG62p4jF9m0cVWa3P7L35lNgAm0F wfJbLCXl9vGAEkPlOCn83o6FRXCOoul14X5YlalBsowIxZ+haYjJCSNJzxvEaYUx9rVi Qapw== 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=OJ7zIDBZXnlP6Cp9E/4Oqx+EQRzcRWQhg9JtQ0auto4=; b=SW26Ec0DrMBMqXL6jP7IYmhZoQ4afZ2OCDagKG6+66EyogQOdPWW60T24TMTyOZ1dG AcPRDfRQ3jGthktSb+FmSIiGNJPD80nrLp1aYrDTr6KEucqPBXkGPB4YbNDAQCOshDKJ /GYACUMe12dyLjQgHaIF+1clN2Aef5cG7ROznJWmD2/fvDCrCW7ebWwLhqN8qsef4U9q KRu4yfS8cHW6jzMBXQzUg/vpyzz2C7CrSMJmAeVJWeTHkqKJ6vYtazsUmJD+Om+lYKDk wYUZNQkRmoYr7k0Ga1JyyZhEB5XSmZbkHXFS+ulwzpkso+iRTRITsqVmg4pYHF9BX8kN KOhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=iTWvp5gz; 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 gt13si939403ejc.441.2022.01.12.21.14.32; Wed, 12 Jan 2022 21:14:32 -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=iTWvp5gz; 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 E4E9A68BB9A; Thu, 13 Jan 2022 07:14:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20C5F68BB90 for ; Thu, 13 Jan 2022 07:14:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050854; x=1673586854; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1B358IcgsR3hlosfOD7CqpqidAx4bF1ynSxkaKjaxWA=; b=iTWvp5gzVe5F6oxQQeGVUm1RNajt6PJmJpob0Zm1J+PeniV563r/zFbL 0Pv9UqNcHAfbtGI9GHF2XANLNzhQRQee3PpKI2Y+itBKgUxM7Qa6mVKHz vfmHXVldAahZGPhRkrQUxuh2F373f48pdpoRr90IlFIP9+GDysBNOpuNY 2oAnB8RRzHAxWBXiGLV/T8uIsImrxI+dz4vy6sXHaUoYicpbcKIKp0IzC S7Mxi7BjxQbgNQwFUO2pZsF6SFLlRrPWTdgJ+KKdt2VAnGFq8id7s5j4R jQLDzLT3NUxHV1umlnaL2CMZM7/genARtye2n/CxRUKieWq/DugK+jGmL w==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138133" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138133" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736729" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:42 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:20 +0800 Message-Id: <20220113051221.66453-3-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113051221.66453-1-wenbin.chen@intel.com> References: <20220113051221.66453-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 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: FMMD9D4QX1ld 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 e87b69369a..f2ba0241c6 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 @@ -934,6 +942,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 aa49b35f07..960604cb9a 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 Thu Jan 13 05:12: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: 33545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132824iog; Wed, 12 Jan 2022 21:14:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTYsU+rJ3zVCM8BSXokT7kHj+5QpZ4NNXKUddFkeGPtSMEkeAu+NpcRvZ05kbblV1Ksr01 X-Received: by 2002:a17:907:9810:: with SMTP id ji16mr2313155ejc.202.1642050882164; Wed, 12 Jan 2022 21:14:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050882; cv=none; d=google.com; s=arc-20160816; b=w16Bl9+NFRfJ96hrnXKDv83SyD9RnI7N9bzSX9wEjHNywGlQGoBcFNUilgeZQmAkk5 t6Hnv0+RFtoCeC45fP1qvYDdLLh+pNByF3JkDKKVu4uXYVBfd2OjfAc+Ga5dDpWg2xDF frUk7m/0qqvn9wRHJ8y9+rdR2LIvfXFfBFPvRPjfMVFdLqOsG/V1RuRUnfSq8xkRIVQA mRxV7mYZSsuw4PIr6NsUZv8pAdDtw7FGMllPE27VkRs5UhMyfcSkpBa/fKuwxCJIg+lZ /rTs6mdBut+eUYJ8eAQaL7/Vj3jg3uy44+D9T/oixmgU1mqlHF080knPyFPY9kht6EMr p2Lw== 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=V9twL0vTEyLFbgiKJ9w/MQyxkOGpf1n5+dJq8v/Olp4=; b=0c93lYDYx2sYOMouewfvca8SlptWAnSBHR1MVvLmWVy6nPgqDLbXRAR6A7sXHA5uGh 6d3D5XWHPGHWFiwH0pudsXrr5lYWTc7k34AT5u/De2MGcStlk0ckfPc4z7ALWcZ6L/J5 YaHvWQNrz8zzhIExocR8Vidvr6KOOfsPUP7JMrpuf4oUnE2X54K8QJhj6bk++/w2xTzR /Rsw3t9w+mvKfe0phLb5MZf+w141GHZZhpl3ZDRVOY13pQuM0b3qqW+Tkh1Pg7b5ekaa q/dEPwHMtUaTLNRECX/ER2/sLfwEpo36uE0Pb25/deaVWmQViIAlE/u9dWCTlNGyMPm4 TvMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=k+hnY2Ob; 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 hv22si904969ejc.594.2022.01.12.21.14.41; Wed, 12 Jan 2022 21:14:42 -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=k+hnY2Ob; 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 E61D068BBA0; Thu, 13 Jan 2022 07:14:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EA0668BBA4 for ; Thu, 13 Jan 2022 07:14:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050857; x=1673586857; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=U4zvllsmedvrFmGE7Drb/gRmcavgt/n+bsrzpUypPn8=; b=k+hnY2OblFsFU97G/cu9fRivcIoofcb0I+Frw848Bvif2CCknfz8xbh+ OoooZMgPvCdZcKNwxTr37y5Cf2BVjanE9cUcIHL6PPw2v0ao8j82sFUTt 6nFKpyGPnLaswjJZADJeGLXO6dXHKny6nQ5wi3ighkHJwgegS3WlILGdQ FX0cmXcE8ZIKQqyn4AJEzEM6SI0xu6G089RcBHK9BjN+vmYu0jKf6FDlO h3s4mwwIFHMgdvuJF/p84d5jDdonvXmm0+jOqYeW93n1LL2fhi3vAovCa nMwnmlWQFkHoRZ6UU7cAPmd0xOAoNDAlUqF0DAdB6svVe5tIreBFoeV2U A==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138139" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138139" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736741" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:43 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:21 +0800 Message-Id: <20220113051221.66453-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113051221.66453-1-wenbin.chen@intel.com> References: <20220113051221.66453-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 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: IeJPK2KeTWyR 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 CNL. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 4 ++++ libavcodec/qsvenc.c | 10 +++++++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_hevc.c | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 3d7c944fba..7714084864 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 CNL. @end table @subsection MPEG2 Options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index f2ba0241c6..4e5997c9ed 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, @@ -970,10 +973,15 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) #endif } + if (avctx->codec_id == AV_CODEC_ID_HEVC) { +#if QSV_VERSION_ATLEAST(1, 26) + q->extco3.TransformSkip = q->transform_skip ? MFX_CODINGOPTION_ON : + MFX_CODINGOPTION_OFF; +#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 960604cb9a..5a574ada30 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 }, };