From patchwork Thu Nov 29 08:29:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 11223 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 C08C144D85A for ; Thu, 29 Nov 2018 10:29:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 741C368A764; Thu, 29 Nov 2018 10:29:40 +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 69DE768A6EF for ; Thu, 29 Nov 2018 10:29:34 +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:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,293,1539673200"; d="scan'208";a="104868030" 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:31 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Nov 2018 16:29:07 +0800 Message-Id: <1543480147-4359-10-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 9/9] lavc/qsvenc: add BRC sliding window setting 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" WinBRCMaxAvgKbps is to specify maximum average bitrate over a sliding window with size of WinBRCSize WinBRCMaxAvgKbps will be ignored in CBR mode and equal to TargetKbps. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 7 +++++++ libavcodec/qsvenc.h | 3 +++ libavcodec/qsvenc_h264.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2dd41d7..9c2f2a7 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -263,6 +263,11 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, #endif #endif +#if QSV_HAVE_CO3 + av_log(avctx, AV_LOG_VERBOSE,"WinBRCMaxAvgKbps: %"PRIu32"; WinBRCSize: %"PRId32"\n", + co3->WinBRCMaxAvgKbps, co3->WinBRCSize); +#endif + if (avctx->codec_id == AV_CODEC_ID_H264) { av_log(avctx, AV_LOG_VERBOSE, "Entropy coding: %s; MaxDecFrameBuffering: %"PRIu16"\n", co->CAVLC == MFX_CODINGOPTION_ON ? "CAVLC" : "CABAC", co->MaxDecFrameBuffering); @@ -723,6 +728,8 @@ FF_ENABLE_DEPRECATION_WARNINGS #if QSV_HAVE_CO3 q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; q->extco3.Header.BufferSz = sizeof(q->extco3); + q->extco3.WinBRCMaxAvgKbps = q->win_brc_max_avg_kbps; + q->extco3.WinBRCSize = q->win_brc_size; q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco3; #endif } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 075c86b..1f9769e 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -168,6 +168,9 @@ typedef struct QSVEncContext { int repeat_pps; int num_mb_per_slice; + int win_brc_max_avg_kbps; + int win_brc_size; + int a53_cc; #if QSV_HAVE_MF diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 693a9e3..d943ede 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -158,6 +158,11 @@ static const AVOption options[] = { { "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 }, +#if QSV_HAVE_CO3 + { "win_max_rate", "maximum average bitrate (in kbps) over a sliding window", OFFSET(qsv.win_brc_max_avg_kbps), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, + { "win_brc_size", "sliding window size of win_max_rate", OFFSET(qsv.win_brc_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, +#endif + { NULL }, };