From patchwork Thu Nov 29 08:29:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 11225 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8209B44D85A for ; Thu, 29 Nov 2018 10:29:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3387668A72B; Thu, 29 Nov 2018 10:29:38 +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 7447068A701 for ; Thu, 29 Nov 2018 10:29:33 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2018 00:29:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,293,1539673200"; d="scan'208";a="104868022" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga003.jf.intel.com with ESMTP; 29 Nov 2018 00:29:29 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Nov 2018 16:29:05 +0800 Message-Id: <1543480147-4359-8-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543480147-4359-1-git-send-email-zhong.li@intel.com> References: <1543480147-4359-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH v4 7/9] lavc/qsvenc: add an option to set MB numbers of each slice X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This option specifies suggested macroblocks numbers in each slice. MSDK may adjust it based on platform capability. And slice_number will be ignored if this option set to a non-zero value. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 1 + libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_h264.c | 1 + 3 files changed, 3 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c2e7030..ba74821 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -655,6 +655,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #if QSV_VERSION_ATLEAST(1, 8) q->extco2.LookAheadDS = q->look_ahead_downsampling; q->extco2.RepeatPPS = q->repeat_pps ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + q->extco2.NumMbPerSlice = q->num_mb_per_slice; #if FF_API_PRIVATE_OPT FF_DISABLE_DEPRECATION_WARNINGS diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 4316a10..c2aa88e 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -163,6 +163,7 @@ typedef struct QSVEncContext { int recovery_point_sei; int repeat_pps; + int num_mb_per_slice; int a53_cc; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 13217b4..693a9e3 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -156,6 +156,7 @@ static const AVOption options[] = { #endif { "repeat_pps", "repeat pps for every frame", OFFSET(qsv.repeat_pps), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "num_mb_per_slice","Suggested macroblocks numbers of each slice", OFFSET(qsv.num_mb_per_slice), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { NULL }, };