From patchwork Mon Mar 12 05:38:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengfei Qu X-Patchwork-Id: 7939 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1220342jad; Sun, 11 Mar 2018 22:38:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELunAmaUV4YO7Rg/5hzpMEb/o2Zqmg7qSUmT/HC3XF+GiXyMikhgk2si1z6sbkWLJbln865z X-Received: by 10.223.199.71 with SMTP id b7mr5541741wrh.228.1520833117118; Sun, 11 Mar 2018 22:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520833117; cv=none; d=google.com; s=arc-20160816; b=CAO7BM6IWQLi8BTkR2DtwPlBUxqeq4V1K/2GYw+nhAESHrFlTGEpdcBItQtWup8CPM +C6zWmtsLCoSGWSAJsyiLxdxVKsSt0bwpDrdqU9WJGK0XCah7n/JKl5CT6UVV7mR6I8l Ej/u3271d8nHvBO5z7ZJ7Jk6NCZY9U34BUY1osp/EBktW3CHB/5cff+ib+1M6NPTJeWp EcEySYqSxdOdYbNburM4FJLSl5xVAVUXL1DiP86pmIPwTYJlC4h1zHTaxsk1m7F3AEFa 0KVkZs7KIioJumqtMy8NWH8cMkXqjsJ6LRXq2SB69g0YSDRzE9ojV6fTAA3dBL3l+gsz 5yhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=Vy0jQv96zf+9gh42OZDk6idahYOPJRtWUnh8VEpR2Q8=; b=lTXYQ39ZHlQ/J/kdPyVLr/ij6wK4TCPBwqzrdNW3+XUIVVMjxxjgkVKledNoyu0Gsz C0NkHrADTTk3VMDFQ8vD4jcRFexSkCeUGJCl8S26my0clRpFF5Shlpd6IxWWAHK7awwv LUOaHtdyVUTFKN5B+ibSwKYZAFreEgmgIE2vNcdmihr30T90Mnj7a0KCW/CvqJFO9HH7 x8I8NU+mwSF5PlhGcPXBWZNV3AYZVBOCR3OyfdvsvweBH+V+Md2HvUwxWhj1CMKNCJmx qQkhlFGTThTcGW5ABvic/vBzRr2i9T+ti35cuRNJ8+kQ+b5jaNCMMXQaeY//+PDbKWsP X/UA== ARC-Authentication-Results: i=1; mx.google.com; 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 l20si4211149wrg.3.2018.03.11.22.38.36; Sun, 11 Mar 2018 22:38:37 -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; 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 5D70E68A3D3; Mon, 12 Mar 2018 07:38:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1E41689EC0 for ; Mon, 12 Mar 2018 07:38:13 +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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Mar 2018 22:38:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,459,1515484800"; d="scan'208";a="34202789" Received: from skl-bj-01.bj.intel.com ([10.238.144.117]) by orsmga003.jf.intel.com with ESMTP; 11 Mar 2018 22:38:16 -0700 From: Pengfei Qu To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 13:38:10 +0800 Message-Id: <20180312053810.3679-2-Pengfei.Qu@intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180312053810.3679-1-Pengfei.Qu@intel.com> References: <20180312053810.3679-1-Pengfei.Qu@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/vaapi_encode: fix to set the default max bitrate for AVC VBR 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: Pengfei Qu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" And for VBR mode, generally the max bit rate is bigger than the taraget bitrate. For CBR mode, the max bitrate is same as the target bitrate. when there is no specfic setting for the max bit rate parameter, here the default value 95% is used to caculate the default max bitrate accordingly. Signed-off-by: Pengfei Qu --- libavcodec/vaapi_encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 78347d4..47110cf 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1164,8 +1164,8 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) } else { if (avctx->rc_max_rate < avctx->bit_rate) { // Max rate is unset or invalid, just use the normal bitrate. - rc_bits_per_second = avctx->bit_rate; - rc_target_percentage = 100; + rc_target_percentage = 95; + rc_bits_per_second = (unsigned long)(avctx->bit_rate * 100.0 / rc_target_percentage); } else { rc_bits_per_second = avctx->rc_max_rate; rc_target_percentage = (unsigned long)(avctx->bit_rate * 100) / rc_bits_per_second;