From patchwork Fri Sep 23 02:44:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp157075pzh; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RKMKhgxkYFs6U9CS+9Y0zeEBJnKoUSQszaMH0TV1rYQVE3gHmr/d9TFiMcWf3bZ8MfQ5x X-Received: by 2002:a05:6402:2709:b0:451:d665:e787 with SMTP id y9-20020a056402270900b00451d665e787mr6155180edd.317.1663901303611; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663901303; cv=none; d=google.com; s=arc-20160816; b=mAI5+BM2+r9MAWQfoDgmW9DN7xshBBOSdALENQxxbQt2GDJ1tFg2yZ7C9DwzsOmHWS 9w3t5rhCcgSjCLo2K0I6n4orwnwxQY2uZ1qg3nh1o6gyr3jfscGdRK5m7s2ksf0WD2Hl 0MuvmenFLl3CrvKQfQhHaIB558sPmmr5QsI81br5reyQdlD/b1nop0W+FqUihon64SxU FsxVCoVPexowWmMT9ABPU/w89z+73i8MFi2dRIh+tO4y3+z8yK1YGLrg60U5/t6AqOsA D3B5xLeKqM0BYgOsBj3VNoQrz6M9AHJquF0gOigSzim6gvPRNCVCQJGdwaR3f2kGJ2Kv Xotw== 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=LfxQ2yq5Fr/h+UcTYoSsSNFyErsloqn2x7DDq6bhJuU=; b=wr6+WceHkDOy6x4nvVzs+KO6XAanywcjDFQgVUqHd72Dvm12QWBsV83FazyWMbxNtO SuLMpR+qvWi9MlkyGzkI2u0n7WiYmBXCn8VOlZObx8rpWFWR+z9ezoty7Jf4sy56CgDd DO9XBC/KvGZ5rLoVVEGWR61BiJqSh5XJknp2YEc6lLOZuFboKRrM7myyPbNWThixv5d/ /UO+s7ZPGK8EOY1SfStkKiYen75HrqSzjf5/u8S5/6KtzRlJW3emawgdxAeJrpHnxNqk jKVyOUfVSz/jmOXy3Bq2A2WnHh49iGfWJrjGv9tgNR/yi8wq6uFxaMm2cQR7o2puG8TC LbUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=c0qMPLB8; 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 nd16-20020a170907629000b0077eaaac9b30si4866789ejc.713.2022.09.22.19.48.23; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) 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=c0qMPLB8; 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 6FA5268BB16; Fri, 23 Sep 2022 05:48:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 085D768BB15 for ; Fri, 23 Sep 2022 05:48:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663901291; x=1695437291; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=8LzMoh4q5PzwYimirTRx84zb0Tr+aiDengY4Cmimnbc=; b=c0qMPLB8/7XYrL7G5WE1cr+GkBTs66m/moLj2Kp9DRChHIOVI71XGf39 Ppb4Ac2GdJBCWs4oh7adLEbp+412T6EDpDVlT0HI7WMhIJrbyqvGFAhY9 qls3Z7DFa2cDqnyjDJWA5UxfzsYCxRDef5XilCnqfHi8v5X3kjA5+sdGK vVlIc0WayUgtaA5RPyXsBZ7AnFxT4nI6jqAm6MXNr7wrWyUoADrPK4GOM q6FlTWgZ8j2zQnXJwtDbEPpn34NVtGxttgSxkoUFlOmH8ELLCwS+1DpIE 2qn6W29vgpPOe7SgXcVteXE++fSqwXDh6nr9NPP2VxXNNc9z20vCqprpr w==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386782565" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386782565" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 19:47:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="948858458" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga005.fm.intel.com with ESMTP; 22 Sep 2022 19:47:56 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 10:44:11 +0800 Message-Id: <20220923024412.5671-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220923024412.5671-1-wenbin.chen@intel.com> References: <20220923024412.5671-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavcodec/qsvenc: Add bitrate reset support to qsvenc 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: 3lpgGGm3E9XA Signed-off-by: Wenbin Chen --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 38 ++++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 5 +++++ 3 files changed, 49 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 4ed7ce1bb0..2b6412dbec 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3363,6 +3363,12 @@ Change this value to reset qsv codec's low_delay_brc configuration. @item @var{framerate} Change this value to reset qsv codec's framerate configuration. + +@item @var{bit_rate} +@item @var{rc_buffer_size} +@item @var{rc_initial_buffer_occupancy} +@item @var{rc_max_rate} +Change these value to reset qsv codec's bitrate control configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index ce00cd302b..3371711872 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -718,6 +718,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) max_bitrate_kbps = avctx->rc_max_rate / 1000; brc_param_multiplier = (FFMAX(FFMAX3(target_bitrate_kbps, max_bitrate_kbps, buffer_size_in_kilobytes), initial_delay_in_kilobytes) + 0x10000) / 0x10000; + q->old_rc_buffer_size = avctx->rc_buffer_size; + q->old_rc_initial_buffer_occupancy = avctx->rc_initial_buffer_occupancy; + q->old_bit_rate = avctx->bit_rate; + q->old_rc_max_rate = avctx->rc_max_rate; switch (q->param.mfx.RateControlMethod) { case MFX_RATECONTROL_CBR: @@ -1863,6 +1867,39 @@ static int update_frame_rate(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_bitrate(AVCodecContext *avctx, QSVEncContext *q) +{ + int updated = 0; + int target_bitrate_kbps, max_bitrate_kbps, brc_param_multiplier; + int buffer_size_in_kilobytes, initial_delay_in_kilobytes; + + UPDATE_PARAM(q->old_rc_buffer_size, avctx->rc_buffer_size); + UPDATE_PARAM(q->old_rc_initial_buffer_occupancy, avctx->rc_initial_buffer_occupancy); + UPDATE_PARAM(q->old_bit_rate, avctx->bit_rate); + UPDATE_PARAM(q->old_rc_max_rate, avctx->rc_max_rate); + if (!updated) + return 0; + + buffer_size_in_kilobytes = avctx->rc_buffer_size / 8000; + initial_delay_in_kilobytes = avctx->rc_initial_buffer_occupancy / 8000; + target_bitrate_kbps = avctx->bit_rate / 1000; + max_bitrate_kbps = avctx->rc_max_rate / 1000; + brc_param_multiplier = (FFMAX(FFMAX3(target_bitrate_kbps, max_bitrate_kbps, buffer_size_in_kilobytes), + initial_delay_in_kilobytes) + 0x10000) / 0x10000; + + q->param.mfx.BufferSizeInKB = buffer_size_in_kilobytes / brc_param_multiplier; + q->param.mfx.InitialDelayInKB = initial_delay_in_kilobytes / brc_param_multiplier; + q->param.mfx.TargetKbps = target_bitrate_kbps / brc_param_multiplier; + q->param.mfx.MaxKbps = max_bitrate_kbps / brc_param_multiplier; + q->param.mfx.BRCParamMultiplier = brc_param_multiplier; + av_log(avctx, AV_LOG_VERBOSE, + "Reset BufferSizeInKB: %d; InitialDelayInKB: %d; " + "TargetKbps: %d; MaxKbps: %d; BRCParamMultiplier: %d\n", + q->param.mfx.BufferSizeInKB, q->param.mfx.InitialDelayInKB, + q->param.mfx.TargetKbps, q->param.mfx.MaxKbps, q->param.mfx.BRCParamMultiplier); + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1877,6 +1914,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset |= update_rir(avctx, q); needReset |= update_low_delay_brc(avctx, q); needReset |= update_frame_rate(avctx, q); + needReset |= update_bitrate(avctx, q); ret = update_min_max_qp(avctx, q); if (ret < 0) return ret; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 960197f159..6e1132d2e3 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -273,6 +273,11 @@ typedef struct QSVEncContext { int old_low_delay_brc; // This is used for framerate reset AVRational old_framerate; + // These are used for bitrate control reset + int old_bit_rate; + int old_rc_buffer_size; + int old_rc_initial_buffer_occupancy; + int old_rc_max_rate; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);