From patchwork Tue Jan 25 07:12:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp378941iov; Mon, 24 Jan 2022 23:13:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrqPbgToed9nkMhHqQ2B3ZoVA3f3HQ7RswjjhKxvnSNjrsBaDV1Z66XqsZh3hLLiXdzdEU X-Received: by 2002:a17:907:3e98:: with SMTP id hs24mr4078084ejc.615.1643094807254; Mon, 24 Jan 2022 23:13:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643094807; cv=none; d=google.com; s=arc-20160816; b=UHCuoLmtaH3DzDGq3FOHiRoLvWhkkNH6sXvJ8Ar76w5sz9CkHiY/O8W8jWK2IgKuR+ lWZz5HrGgKc48i9QNC70fEEfeM4FdmoEMOf8vS1jmAqUysw22XWueLgXQr6diaPbEFt2 QIM6auA7BvS/ixhyXyKS12uuFeglOrYP0QUiboxELxl0bNilrs1Omq3R00ByW6qq1B5v Pxyi1+bSnbQ3oDx/Odim2C3o/YpY+6fBA1mnkRSyaUyY/HbhtD5OYj3vzzO8kHAWuaOA SCKJkjS+3DoPdMlPhO0EqK2FLunnXkaLOu8RktHQTCKFN6+rIzZNDcLnl0gMjABavWr0 p/iA== 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=SCY8cOBxu/t7WBmtHNj0Se8b5S5FGFuanP7tHXX9i28=; b=Q4xPJ7PZWmwLUbrKf5ceAl02R082Gdnd1QOk9AjJeOVpUnAkRSNvqLw0/KiG5KCMui ZVG0NbmL5271FAX8Xo9xG4T+XMCKvzFfPv31C1QTV5o2+KoIaNN3CiA9F9xQ7X3DQ9uL /Erw4Y/TSaNX8eQcLDdYD4FJ0CU56sMD1rI0Fx3+TpuvJeW4Sgo4xggXnK8tIOXrig/+ iAICAVN/XgKG2K/pACGOVDI1NEQDqD0yY1epalVMDuFCjCDSLXCUlKHKlIs6xKqqfH6P uKyc7Oo8OUFRPczWjI1N72j2fM1XoFjMR0DbuOvDR4Q2mpFowgOyBMu5HRbCSPU+ReLn 5yOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=mDjf5b7Q; 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 6si4716096ejk.189.2022.01.24.23.13.19; Mon, 24 Jan 2022 23:13:27 -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=mDjf5b7Q; 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 161AF68B098; Tue, 25 Jan 2022 09:13:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E56FB68AF12 for ; Tue, 25 Jan 2022 09:12:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643094783; x=1674630783; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=Yn3cDr09hwWU6yIIfR4ftO9CYdRQ0Vd8LSXbhxKvQ8s=; b=mDjf5b7QWR0+JE5zTxtfudo9XY0ork35qqd9QtiG1GnSK+OuvuCzg+Nz OOtjfINw4iP74FgssFF1Hkm5YiEqsMZJXhiw248BzT56wyHQD2wkyNlTH m/QYKDXRuLqGSFbVae4q8Mv2p/C7O1bBrxWu82zb5Zi6okT4NLic4g0do yLuAbGLU3R0YRfBDhbMo1Rluvj65kdKPLgDsB3+3LdazYiQL1r1WrFmlU XFuHMGuLxXof84CLmuzX7R3PSU3TeD8d/mrd0SRPAl8O/FP4ZAR/eqd9o D5iCAMJAD1QWG8W+SdPqd4GX9EbIJauW7FcNvCyGHaOkVMzCy8QmMWQPy Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10237"; a="309557547" X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="309557547" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2022 23:12:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="695729643" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga005.jf.intel.com with ESMTP; 24 Jan 2022 23:12:37 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 15:12:35 +0800 Message-Id: <20220125071237.58735-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 1/3] libavcodec/qsvenc: Add max slice 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: H3jiBKHdPIez Add max_slice_size option to hevc_qsv as well. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index e3adbf4325..8966610263 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3397,6 +3397,9 @@ Enable rate distortion optimization. @item @var{max_frame_size} Maximum encoded frame size in bytes. +@item @var{max_slice_size} +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). diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 413e5ae8f6..f311cd9ce4 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -877,11 +877,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 QSV_HAVE_MAX_SLICE_SIZE - if (q->max_slice_size >= 0) - q->extco2.MaxSliceSize = q->max_slice_size; -#endif - #if QSV_HAVE_TRELLIS if (avctx->trellis >= 0) q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B); @@ -907,6 +902,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_MAX_SLICE_SIZE + if (q->max_slice_size >= 0) + q->extco2.MaxSliceSize = q->max_slice_size; +#endif #if QSV_HAVE_DISABLEDEBLOCKIDC q->extco2.DisableDeblockingIdc = q->dblk_idc; #endif