From patchwork Mon Feb 21 08:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 34433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3198764nkx; Mon, 21 Feb 2022 00:57:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuK80KHshDZKW4TAqg6M7mObqs+fJlteQdVGUa4BE2qAc/SnM5U4zflaYFTFwIZY83qXeB X-Received: by 2002:a17:907:174b:b0:6ce:70ef:85a4 with SMTP id lf11-20020a170907174b00b006ce70ef85a4mr14956396ejc.486.1645433832326; Mon, 21 Feb 2022 00:57:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645433832; cv=none; d=google.com; s=arc-20160816; b=Kt8T978kAPwNTHxbWHdbnfPlgDTUGPQcS+16dYlbFNxcm18+FKWbzyB5YE8kfIYxcD HV9JZ5jRMkoSnU7rEPncW9aAsNIDlbZvW0ACrgg7BG+w/O08kZs8mTXp7ZvTli2MwsdU B1uoJY8Ck/jBLtxi0BTLGdKddtjs+6w1XkHI5p9QxztsSeq6wMpBUgfqLRpZ6LxiBWg/ qd5EzTSaZ8Auzq4nCCq+BicRRujaSYuwSv6aSGIRF97gTK8otv+Aiw+irc+7jOFil2ll Ed4+LPf0ER8FdVTmxOfnXFwoTvRxGrnx80Nz/eO65u50vj6ef7g1+gSHVJuynb0Rua3p uc/w== 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=ibgVMk6yISSQk7aHWx7e+xpxfwzmAuT4oDMaeIowxTs=; b=aZ4cN811CF2gNtTPXox8ppLr6kMCNjJNjkFQkIl+azMl0TA2s7NNcC7vy3GVrP9E0q ioV7M7mq9oMU5PSS8w3ZT5Agsrj7EQOrl+2Dc9kaXEWCEVyrS36Die9NWa/53n2DyuTi BxgugLGL60ThAJb7TsH5xyiZz/WrXecXgjsnFmbKYMTMR7wXw1RhfywPaP7/pwLvGE++ 9+H57tM/mKO9848cAo1WAmp/TFXyaVf6uGwrK6v4qcxX4vEZdzfMDwKmG2IzwJqHjWyD 716wjPRWfgBtDPCUQRulxUuaBsKg1uxM/FJ7j52wMdXjakEIjvuiwyQozX4YA4jONbIr zKyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jSuMtr4f; 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 bo18si2573310ejb.602.2022.02.21.00.57.11; Mon, 21 Feb 2022 00:57:12 -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=jSuMtr4f; 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 85A1868996A; Mon, 21 Feb 2022 10:57:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A8D968A8F5 for ; Mon, 21 Feb 2022 10:57:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645433825; x=1676969825; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=jCfwj04iTynI/grr1o/f5uo80zIoqgq73qI9ozcVlY4=; b=jSuMtr4fK/n2qZ7uH5BVljxuq8DsYVaXSb/HrjJWMTNzbiY4Ei2tS0Tw uVExqD3loyDDHfbjEZ8wYe44zR71/ylsID/r3Tq951/3IRB1jazIoBqRl RHHAid/fE93nZzFCBGQlYH4w3qN0SkisBMuZMe8ImvzFRAoSYRNbOCxW0 V6yg8zpk4jOWsXno2SYME3FsmelzJGKqJ+w2saW2y+OsgCh0Tdq+43hNJ odtiWJNnQJqEpmdmocbSTDMJ0UDxm+3MHz6+JfoidY0sMCMD7b3SQkcHg o4avVsGNzaTrTP0T52cOmH/6Q/k8FuVolJgMd5/bxgMbCc9dSm16ow+7T w==; X-IronPort-AV: E=McAfee;i="6200,9189,10264"; a="251221322" X-IronPort-AV: E=Sophos;i="5.88,385,1635231600"; d="scan'208";a="251221322" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2022 00:56:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,385,1635231600"; d="scan'208";a="531778336" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 21 Feb 2022 00:56:57 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Feb 2022 16:56:56 +0800 Message-Id: <20220221085656.971981-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/qsvenc: add mbbrc 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: iLuTpADMhi5T Add mbbrc to hevc_qsv For detailed description, please see "mbbrc" part in: https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#mfxextcodingoption2 Signed-off-by: Wenbin Chen --- doc/encoders.texi | 5 +++++ libavcodec/qsvenc.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index bfb6c7eef6..4325fdd6b0 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3404,6 +3404,11 @@ Maximum encoded frame size in bytes. @item @var{max_slice_size} Maximum encoded slice size in bytes. +@item @var{mbbrc} +Setting this flag enables macroblock level bitrate control that generally +improves subjective visual quality. Enabling this flag may have negative impact +on performance and objective visual quality metric. + @item @var{p_strategy} Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0). diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 07be4287b7..3aed0508a4 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -877,8 +877,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id == AV_CODEC_ID_H264) { if (q->bitrate_limit >= 0) q->extco2.BitrateLimit = q->bitrate_limit ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->mbbrc >= 0) - q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #if QSV_HAVE_TRELLIS if (avctx->trellis >= 0) @@ -935,6 +933,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; } #endif + if (q->mbbrc >= 0) + q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2; q->extco2.Header.BufferSz = sizeof(q->extco2);