From patchwork Tue Sep 12 23:44:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5121 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp297399jaa; Tue, 12 Sep 2017 16:47:00 -0700 (PDT) X-Received: by 10.28.226.84 with SMTP id z81mr787622wmg.108.1505260020026; Tue, 12 Sep 2017 16:47:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505260020; cv=none; d=google.com; s=arc-20160816; b=bVeE+dVY6Wdjqo2NfJuWKQ8dypJDjuAw3VVFrFeSFCQAMUd1cyJxCsNKupgbSnE5/t 2E1Sdzodi6wsKFOavrNDLzWCI9x4Fx541MaBt0YAUpMUoOqMgTEiBjQbyNzMVqAURiLl eQhhlmP1qSWk2bLJ4HK0EUKJ188oRDNoTXjF1bjwZB+h4vP2kQcY2JPZqAIZmvtETWKb etu04PHh2Swe28u5Ac5cqVZZPsrpmuMBWKlFGBu3DmjULCNAcioSn9K1hWHjQ47XRQGO tgCIjP/n2m4utMWRzumIhY0oJvQu+nptv5rz+M6JxBcxdAZEg71B/0T8f3rsOSZSTIpi GFAw== 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: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:dkim-signature:delivered-to:arc-authentication-results; bh=E01/19uyOswU/qREMYBVBBq6Z8lWGVi582OBnWx/EaU=; b=l/aSk3rRDRyMoYfO4105DyBrFC3SL9pxBG8MbVNS0CuRk7PzxoMyq5ZRPGLj9FMa9E 7PYu50kMaIdRyJLnq1TWzWWGWzdIx5Ns2P+QPt+/FntUqa7fxDewegGVtmbZ0aQVKHs6 fFyApP52f7blOurjkXDAeIe3G2LPtv2AyuFdzkLgWCr2QE9kwqsxJWMcF6Hfo0omnfZH Qvwb/yqdbIE2G/s25FnnhTRDnl6z8C3eKybryv6W7fs9GdBkYNU3aZtlZJ2dmLw7Rlwa PfJyCSwaMTi5u8G1mo4SXmfryl8uAqvOwtQT8PyuPfNmCy7wkBZVQtQRS469KYiIhwKU hpsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=15QZxj2m; 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 q134si9775085wmg.249.2017.09.12.16.46.59; Tue, 12 Sep 2017 16:46:59 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=15QZxj2m; 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 BD66B689E83; Wed, 13 Sep 2017 02:44:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55681689E5C for ; Wed, 13 Sep 2017 02:44:24 +0300 (EEST) Received: by mail-wr0-f173.google.com with SMTP id a43so25599058wrc.0 for ; Tue, 12 Sep 2017 16:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=gc/xv+KgT8LY2r+fZpry7xDGyC9sY1AS4QmK9I9VfX0=; b=15QZxj2mUWw+pbCFu7TDhlOOtctkd+6uYrnVUGYFnnyI7sHt+/YztD1K7IdZGTlNTy hNn4nK95X6zEZcrH1bgVs5cM5pdR7g4MkkC+cvzPGgByAVfrkAtKRvAa8fi/R+oWfgR7 3dAlja0Fl//+HD/6tM3FhTfcpZlCW1XoG/VwqGEfUqeRQ4GFujMi3w4mSt8QYbkkjMyd l/CP4fKTsF75UmxtFMlOKr7ImvCRd1J2fcic3Sb7cTCk0lDdhKA4SZCVRazj1leVVGm2 Uqydvw6TWTw25h9PoL3HfmZy9ONEe8fE/1owGQ4qPzYd2fRBcNNOoLO9q9e8uRXjzUrv e1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gc/xv+KgT8LY2r+fZpry7xDGyC9sY1AS4QmK9I9VfX0=; b=W7u+eU6t77ctG5qUSdYalYNeE0et8P1us6gJAcP8FVclUv2nW86QXwoxR/H+hpvCFC oupBf7DgLD3c4vAyUFCadygupJy9u8akkpHFqiSDaNBemqSMY96GJjpUiSZnP4qliI8f AAmxt+VtMRxbntiYRwo2W5cGGgi34ksq6h6pdXNejeDUSrdyio9T6U9x+rjnrTZ3vfI/ CE2nZ+OrAmP7D/PnHBv/Be40WB+fEalT7uDVtWizT67JEF3B2GwpXXbTY141sCYCdpEw aHGbQuzgdyOxO4Qe6K5U7AGDyqfprwYOaN4jxPCItTEgCBI8xFdENi4PQgjzf2hN1Dv8 TeEQ== X-Gm-Message-State: AHPjjUh8/1BbRRR8ZHIRirc5p4jhdctFO96OaVutqxA1pM1eMn81gvXk LJlWYiih+fZF5XgyUqA= X-Google-Smtp-Source: ADKCNb7ybppSSFCLfLh5a6GFVM8r2rAHon0rTkJM4OiHxUQez110YLtY1b4QkCG1p94aixbpVZC65w== X-Received: by 10.223.195.37 with SMTP id n34mr12831443wrf.219.1505259869774; Tue, 12 Sep 2017 16:44:29 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p193sm4378138wmg.37.2017.09.12.16.44.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 16:44:28 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 00:44:05 +0100 Message-Id: <20170912234410.14093-16-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912234410.14093-1-sw@jkqxz.net> References: <20170912234410.14093-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 15/20] vaapi_h264: Fix CPB/DPB delays 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This should be ticks, not time_scale steps - it was wrong for all framerates not a multiple of 1/2. (cherry picked from commit 30645174e333c7db1946ab09be769db9be9d7481) --- libavcodec/vaapi_encode_h264.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 2ba9027230..836daf603d 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -616,10 +616,8 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, if (opt->sei & SEI_TIMING) { memset(&priv->pic_timing, 0, sizeof(priv->pic_timing)); - priv->pic_timing.cpb_removal_delay = - 2 * sps->vui.num_units_in_tick * priv->cpb_delay; - priv->pic_timing.dpb_output_delay = - 2 * sps->vui.num_units_in_tick * priv->dpb_delay; + priv->pic_timing.cpb_removal_delay = 2 * priv->cpb_delay; + priv->pic_timing.dpb_output_delay = 2 * priv->dpb_delay; priv->sei_needed = 1; }