From patchwork Wed Mar 29 09:35:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 3166 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1017997vss; Wed, 29 Mar 2017 03:06:22 -0700 (PDT) X-Received: by 10.28.208.72 with SMTP id h69mr555673wmg.100.1490781982021; Wed, 29 Mar 2017 03:06:22 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k65si6612957wme.56.2017.03.29.03.06.21; Wed, 29 Mar 2017 03:06:21 -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; 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 66E36689AE6; Wed, 29 Mar 2017 13:05:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B9266891E2 for ; Wed, 29 Mar 2017 13:05:50 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id p189so1315134pfp.0 for ; Wed, 29 Mar 2017 03:06:12 -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; bh=R3GMJqYokn7F3Yrt42mETNinQW+GiDmdoRn0iML6NLM=; b=ZZCEO1m9/AcaKnSrDct3kcVecjeKu7unXXAJq3v8wciyh2NEKw61edNm/DILkKOd0W dsTHsEt2owyeGSbLK1PMrO0mqnWEHDlzOCf+eA1o6iPIQqn8suTlrVSrEfBARh6Xw1r1 17Pf0cwM7opYQZSJznfCdD968ygU99+4vzQkeaIIgGXvisBgD/S5T7ADRMH15/MLPZLc 1ynAc60f7P/lvglhPdP3se9XMBOaD6PPjYQIbZb7ET0lb7o35Mbj+bnJOmvKBpoW8nHl DaOdWGoUxOUpdCKT4BQOvMQ45adN+IjeYlb7Qvv3lq2mxd2oE19rw5Ip/NwneP/c/s3e hnOQ== 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; bh=R3GMJqYokn7F3Yrt42mETNinQW+GiDmdoRn0iML6NLM=; b=FFTfBn1gt5hjCm8nl3M8G6vRX9zWvf6cnVc/ptIaEIpPNWA92Ee0BAxrLs8p1tLCGk wBs0YFHny8xC87XqieyMUsXtjF+vW1iJ7B8nYLKFk8fRogWf6keI/VUL03Gu+5K0MZtx FJdxYgxVuA8bkrGFHzJn2SRaDdlV+kUOYe/hmilXS6jdkRoFL7bn2a7UHJQC4JloUVlo l60z+6Wkn/hv2tfAHV3GZm5dQlU57ZdilHrbWpit3RLIfh06k1Qetg2Jvai2VBMit5Gn HivJ0IW/Aqq8YZFqd87Ve0aPilQiCC+2tSpcN5wVOzlz4x4u+RFxS+ouabJiqJZHlFsL Rb8g== X-Gm-Message-State: AFeK/H3DZ5LIKtgfs8PnRVw2U+fXHEDn+S64yKlMqYq+vQaGvR3pZKsnXaKAAHofCrqltQ== X-Received: by 10.98.58.136 with SMTP id v8mr36697323pfj.230.1490780147217; Wed, 29 Mar 2017 02:35:47 -0700 (PDT) Received: from [10.239.204.195] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id e7sm12407711pgp.2.2017.03.29.02.35.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Mar 2017 02:35:45 -0700 (PDT) To: Mark Thompson , FFmpeg development discussions and patches , "Shang, Leilei" From: Jun Zhao Message-ID: <860effb6-e4bc-49bd-8654-361ffd6eb9c9@gmail.com> Date: Wed, 29 Mar 2017 17:35:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Disposition: attachment; filename="0001-lavc-vaapi_encode-fix-p_per_i-calculate-issue.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_encode: fix p_per_i calculate issue. 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 3afe863771fdb1ebf2316d2f6ae5ea2351e7cb4f Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 29 Mar 2017 17:18:59 +0800 Subject: [PATCH] lavc/vaapi_encode: fix p_per_i calculate issue. now gop_size <= (max_b_frames + 1) * p_per_i + 1 (IDR frame), so celing p_per_i = (gop_size - 1 + max_b_frames) / (max_b_frames + 1) Signed-off-by: Jun Zhao Signed-off-by: Leilei --- libavcodec/vaapi_encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 070ff5f..7e9c00f 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1433,7 +1433,7 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) ctx->output_order = - ctx->output_delay - 1; // Currently we never generate I frames, only IDR. - ctx->p_per_i = ((avctx->gop_size + avctx->max_b_frames) / + ctx->p_per_i = ((avctx->gop_size - 1 + avctx->max_b_frames) / (avctx->max_b_frames + 1)); ctx->b_per_p = avctx->max_b_frames;