From patchwork Thu Oct 25 12:36:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 10779 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 647E744BE01 for ; Thu, 25 Oct 2018 15:37:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D476C68A6A5; Thu, 25 Oct 2018 15:36:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62B6A68A68A for ; Thu, 25 Oct 2018 15:36:30 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2018 05:36:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,424,1534834800"; d="scan'208";a="274359176" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by fmsmga005.fm.intel.com with ESMTP; 25 Oct 2018 05:36:58 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Oct 2018 20:36:10 +0800 Message-Id: <1540470971-2838-4-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1540470971-2838-1-git-send-email-zhong.li@intel.com> References: <1540470971-2838-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 4/5] lavc/qsvenc: add an option to set h264 pps for every frame 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" RepeatPPS is enabled by default in mfx. It is not necessary mostly and wasting encoding bits. Add an option to control it and disable it by default. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 5 ++--- libavcodec/qsvenc.h | 2 ++ libavcodec/qsvenc_h264.c | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index ad432fc..fffca65 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -648,11 +648,10 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extco2.Trellis = q->trellis; #endif -#if QSV_HAVE_LA_DS +#if QSV_VERSION_ATLEAST(1, 8) q->extco2.LookAheadDS = q->look_ahead_downsampling; -#endif + q->extco2.RepeatPPS = q->repeat_pps ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; -#if QSV_HAVE_BREF_TYPE #if FF_API_PRIVATE_OPT FF_DISABLE_DEPRECATION_WARNINGS if (avctx->b_frame_strategy >= 0) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 1f97f77..9aebc2a 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -162,6 +162,8 @@ typedef struct QSVEncContext { int int_ref_qp_delta; int recovery_point_sei; + int repeat_pps; + int a53_cc; #if QSV_HAVE_MF diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index ac7023e..893a737 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -155,6 +155,8 @@ static const AVOption options[] = { { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, #endif + { "repeat_pps", "repeat pps for every frame", OFFSET(qsv.repeat_pps), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { NULL }, };