From patchwork Tue Oct 31 02:37:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5773 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3418689jah; Mon, 30 Oct 2017 19:43:27 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S9bFAjMDORQ2VuWrMFyBCzHne37/j6jzwh7faYy0CXArHlGbQWRMEgOeZRC8B+FtnSmffH X-Received: by 10.28.104.214 with SMTP id d205mr549821wmc.151.1509417807112; Mon, 30 Oct 2017 19:43:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509417807; cv=none; d=google.com; s=arc-20160816; b=xvGpK6VDDhGwLEmq7QKGS3dtoaNCN8jrGRYnyWtFqawcY/f7ppVfCeNkBs8YKdEWri 8QWSvmrlKXgBoEhQyBezyUqpDRjwJo9cDVOXgBGYUb5dTuXdow3WIpy4TxDGXLEE8md1 0Iq15cZLl7rb3EHr2pOvGx9al5eITjvcxLw5ezFdgyc6ABXdwfVNcwng/gB8GoBN8UrQ 43me5njkb51KjCIjNeUdiK/q9S6GcY9DBTUWzjxYsl1F9uFxtVI+9f/34yIsd/Komosi pJ4cgwXjJ5X1xU5oiTE2mUW4k+mBmSs8ygJYYNAhp0NBj92I2LLcnARmPuQBqw5kBlSY Tw/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=3GffmwJAAppx8McvsWe4iq6+6bzc53QPGajMSI/ntZM=; b=b3ajYIC2SXWnZkO7xOJM/LJCMAD329IaZ5meigmFoXTWNUoeSc0TBv3OPR6ouPu6iZ OAdUjnfxr7DT7Z6m6VT9mH9d5LUCnrH98sLtg909XG5i9wFJeDu64s94a7Jogzref/Fj 3Be2jevLtuzFswQOdSWQ467acGDPfa5475uLh4iyBEIiRr2bXDkmgC3XCbzXPURM5EMa S+aCkcouSMNIPotmMJWP0s5T8Td3UxhjiOhyYUlh4VlHV9f2MU03bXMFnfsReHyGXuZQ 84zyhtI/8aH1qivOqbFoGGP0ZzjNOXlF/tkk+LPFMp0M7rRT5hZVPSJj3RNpDugCa7l5 aiQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tSthU10Q; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j21si363545wrb.482.2017.10.30.19.43.26; Mon, 30 Oct 2017 19:43:27 -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=@gmail.com header.s=20161025 header.b=tSthU10Q; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A6D1689F9F; Tue, 31 Oct 2017 04:43:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17533689F62 for ; Tue, 31 Oct 2017 04:43:09 +0200 (EET) Received: by mail-pg0-f54.google.com with SMTP id a192so13364535pge.9 for ; Mon, 30 Oct 2017 19:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=+dbHaG23gTPCuuw7k/GdgoqDUT6/BKD/E901bdLXD4g=; b=tSthU10Qzh1RRleIhmlZpFStFVfmjb4HCDQJM28bjk51TDgMFTMo016DlhgQDDKvVh EVHyzSwzaqoOoUsf2YWA10ALOf6xihTAQ4SfFIoHieEzAUndZcqiQX5CISZ10J/HWd0/ LhOSRZDqReAQ03spmT/7IgzsFpcNxvx+ad/mOaXPx9ZSISrKuV+Z+mDG8gmSF3BAZerj jWeiRzRQiMgUsW1FOAXBSuU9A2wtiYXJdI7f84HnkfsGApgUc189bx58pu3HuNhrR01s v3jd3cCkcMHM4o88Cj0K7lJqP9ExLLE+vF2/PafWluKpCgpKwEfQH8T3u+3whpfuz8iq IrLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=+dbHaG23gTPCuuw7k/GdgoqDUT6/BKD/E901bdLXD4g=; b=VPgfOtFQEQZUprFUarJpovZscL5NChaFq2DE62QXwfOJgXvnE6r8VC5TNDM0VxpTBk TbJYDaMvopGA69s8UFtxkFtJwxkaTUNLgCgF3fP1sT0B117nE7z60ibvA907NyiWZ++d +NSthzhFNbHnOpKIfb0n0hMj8AIsdDBRNZ6RvGDBHUT5bfxiX19p2SttqazIlLTmAToR /am5JJEQUr0UR31mEChe/fm5mnV2MkYME//IHcbty4GWiNZ4/X+YSLFofKXgagUWqnvS 5f63mCu/eR9Sp24L4CXBd/MJNBVIudYMTnAQ2RwPLYsldnBFrR2+xBaENkYxOGXpuXAt 3iMA== X-Gm-Message-State: AMCzsaW4D3jXZ6e3u2IDNKaxNFHu4iTxxNupa1kfIvR6ML343LKEBUq6 exX6MikY0v+Xj8Cts1Q3Gao= X-Received: by 10.98.32.12 with SMTP id g12mr439395pfg.196.1509417455622; Mon, 30 Oct 2017 19:37:35 -0700 (PDT) Received: from [10.67.68.21] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id y127sm353903pgb.52.2017.10.30.19.37.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Oct 2017 19:37:34 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , "Wang, Yi A" From: Jun Zhao Message-ID: <2a2f2a9e-9761-4aa5-acee-3b70b4cbb51d@gmail.com> Date: Tue, 31 Oct 2017 10:37:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 1/2] lavc/vaapi_encode: correct the HRD buffer size calculate. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 7eef9be1c8a92bf625d62a0f97f762f1342c6d78 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 31 Oct 2017 10:13:42 +0800 Subject: [PATCH 1/2] lavc/vaapi_encode: correct the HRD buffer size calculate. when rc_buffer_size didn't setting, always use the max bit rate per second as HRD buffer size. Signed-off-by: Jun Zhao Signed-off-by: Wang, Yi A --- libavcodec/vaapi_encode.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 590f4be4ed..d5f89ef346 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1144,19 +1144,9 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->rc_buffer_size) - hrd_buffer_size = avctx->rc_buffer_size; - else - hrd_buffer_size = avctx->bit_rate; - if (avctx->rc_initial_buffer_occupancy) - hrd_initial_buffer_fullness = avctx->rc_initial_buffer_occupancy; - else - hrd_initial_buffer_fullness = hrd_buffer_size * 3 / 4; - if (ctx->va_rc_mode == VA_RC_CBR) { rc_bits_per_second = avctx->bit_rate; rc_target_percentage = 100; - rc_window_size = 1000; } else { if (avctx->rc_max_rate < avctx->bit_rate) { // Max rate is unset or invalid, just use the normal bitrate. @@ -1166,8 +1156,17 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) rc_bits_per_second = avctx->rc_max_rate; rc_target_percentage = (avctx->bit_rate * 100) / rc_bits_per_second; } - rc_window_size = (hrd_buffer_size * 1000) / avctx->bit_rate; } + rc_window_size = (rc_bits_per_second * 1000) / avctx->bit_rate; + + if (avctx->rc_buffer_size) + hrd_buffer_size = avctx->rc_buffer_size; + else + hrd_buffer_size = rc_bits_per_second; + if (avctx->rc_initial_buffer_occupancy) + hrd_initial_buffer_fullness = avctx->rc_initial_buffer_occupancy; + else + hrd_initial_buffer_fullness = hrd_buffer_size * 3 / 4; ctx->rc_params.misc.type = VAEncMiscParameterTypeRateControl; ctx->rc_params.rc = (VAEncMiscParameterRateControl) {