From patchwork Mon Jan 24 02:59:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33757 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2375310iog; Sun, 23 Jan 2022 19:01:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjXfd01nRoBBLwtzZEr9dwVup5uEdMfdTjx1Q+NNdFzmM1qiU7zULOlC1/8bUlydlny3mV X-Received: by 2002:a17:906:6043:: with SMTP id p3mr10558420ejj.667.1642993317877; Sun, 23 Jan 2022 19:01:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642993317; cv=none; d=google.com; s=arc-20160816; b=IMXKeFu4oMYb3FH0vSjuGO3RkebO01vK3tAGN3/Ia2e332W5kaieZwNWW46WOGgCZI lRJW9Zxd45+5RDnEsCBJa8Ge29gO65jB50zvQJkqqjZIG5+vLOZ5HSMyR3Vm9odmycHJ EdcpTEp3uHZCYkz92q191MzIqCf5tOUT2GfSFXLYdRL5qpd6//Mdhc6Wxs8ifKzHYcUf cwtellwa3pgaU8oQYIDnwuW7QJW6ii2dHbnTEbdL1lF+AEQ3gnwHrJNBwklBjZpJPUrq DJr/ImU41NUlzsM+mUw//ZATMZbNGdMCcSrgVcx8rq1QUlt/nDMeYwa2gkPkD0LIIFfV hXWg== 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=hQSHhxkrfUE4h1NslvCyJvI0MPd/ogas1GnGhOPqNLI=; b=qcq1Qnu066GMABqBUakVhaZDNrMX4Y2sJn2mi2bSoxUlGLsoS/3D5SKpYWQ5FIeBXj zojUpcMomwxI3NjvkhOGhP3wwuTLLeCvMuj+kXGdB+0XXJhMEcIv0HJaNa6lKPiGG0iW fCo5AXqH4N028ZghQQOej6WWnw/nLA7WiRdDpXWNrSPZqo8hMovfprYecPlhCqnZWCZB F76ECyI+y8CZJOwe21txONWlGrU6kSrLGfUn0KjoiwWp5AdMYIhXcTe+/FjQqwhfSY5y vEHh5tioGPA2m6eqik3eZo3H4rafUrIN6+o0wRxem1gKk0lHf8fJMlgs0XAsCWj/8JqC U06w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=gy3yOQ46; 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 hd13si762871ejc.889.2022.01.23.19.01.57; Sun, 23 Jan 2022 19:01: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=gy3yOQ46; 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 9192668B037; Mon, 24 Jan 2022 05:01:49 +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 7D74D68B000 for ; Mon, 24 Jan 2022 05:01:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642993307; x=1674529307; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=3vL24rvqrBHmOjlYElyTtf7N0K+G7Uxj6BcX6uQO9rM=; b=gy3yOQ46299hlR/E5drnRNYGXWli4+UdaOLfKo1IEJjqoU+lLFSTRVXM WGFQVLxJyB0U1lno65yGpnrmW43docm8H0KmoJCH4dkG1t4tKhBY6hypb IGiLnAgH+7PCPGoSFoT2f2ajVQdVID08r2y4C+LJDlR5ndOWc35dnNEwE nkGkQkIxVqqZqe+wsAFqR6MRPbjXTLcD937gzGflSCD6Ym6+KqjNbrX+c noTOqEGYlC4DXBKdv2XwMfncUFSuSfxTtfhxEnTwRXLbuAflSHhb2Nj59 2Wm1I1RmRHRy+64Q1magn98GlLIUewA1SlP/MxFguqCTVFutoukW+H28j g==; X-IronPort-AV: E=McAfee;i="6200,9189,10236"; a="246168125" X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="246168125" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2022 19:01:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="673480637" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga001.fm.intel.com with ESMTP; 23 Jan 2022 19:01:33 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 10:59:54 +0800 Message-Id: <20220124025955.204168-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220124025955.204168-1-wenbin.chen@intel.com> References: <20220124025955.204168-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavcodec/qsvenc: Add b_strategy option 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: fXWtuAs4D/mg Add b_strategy option to hevc_qsv. By enabling this option, encoder can use b frames as reference. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 8966610263..6c1c4df57a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3403,6 +3403,9 @@ Maximum encoded slice 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{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. diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index f311cd9ce4..a8d876d6d9 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -888,8 +888,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.LookAheadDS = q->look_ahead_downsampling; q->extco2.RepeatPPS = q->repeat_pps ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->b_strategy >= 0) - q->extco2.BRefType = q->b_strategy ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF; if (q->adaptive_i >= 0) q->extco2.AdaptiveI = q->adaptive_i ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->adaptive_b >= 0) @@ -910,6 +908,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.DisableDeblockingIdc = q->dblk_idc; #endif +#if QSV_VERSION_ATLEAST(1, 8) + if (q->b_strategy >= 0) + q->extco2.BRefType = q->b_strategy ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF; +#endif #if QSV_VERSION_ATLEAST(1, 9) if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are set but invalid, please make sure min <= max\n");