From patchwork Sun Oct 8 20:01:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5475 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1906786jah; Sun, 8 Oct 2017 13:04:50 -0700 (PDT) X-Received: by 10.223.129.99 with SMTP id 90mr654285wrm.243.1507493089924; Sun, 08 Oct 2017 13:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507493089; cv=none; d=google.com; s=arc-20160816; b=YyGJ6DSiU8vhYHUlZR+fs9anjk5LNbU/EQihLBQLt1QQu0me/CMZddB4co3n7ZlHVn cLZlo4HKokV2yqbsANzENSDPnZnGQzENiwZ4GTraQga4R7XjmXpsSv4zF9rKOJtyHxyP 68YtEedI3M8ekWqLerQKf8O25zAnoSW3ke4hFCApGqPWh2Q4f73tgXbZ7J+jzrzUPO7C JfFwFORcxu2h/j665/OhhvOTTNZKGd5DgMTs8o3JC1qDdtmHN+8rOK2IwDcyVoFwF34+ S6tc2PMpc/fK8KJVHpvmI4BteLemULd+UNnpRg1ASUrrSkJU2gzyp9WNbggtTX8qBSDu fbMA== 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=Xo10tXcpWcqrr6CIfLox0LFjo0ODX2Fys1u/OFbsXxA=; b=HqR+tQ8gmpwmBPpp5AeGKESI1hvLzsqw08D/4SVovXzWajGYTBxULMnXP/1ciGS3/C 1FFg5XtmFJSdYavypmB/BH8FEvpDC4i1qlKycylRQ21UpWVCZnRDO1PFMMDaTmC+1fbN pb86rGR9/GWAYHP2pcPJ+LSHROJ/nk8nLCFBqkHj79GrA1X42NTNBfLcyZdtThfTy/O4 ksErBaiQwtcuLoOfg+xtxgpEmzvqi/jrxjb679L6SwF8s2ReToKfaL9Henu4Sm2JFi06 yfzt1KwUo8+CSBIbbhl2o9a+8Ge2mU+MPxuUdkVfL72hUphSALkjFcO6BSLGF7YR5/aY RAIA== 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=S4iYPQ5M; 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 f53si6263427wrf.172.2017.10.08.13.04.49; Sun, 08 Oct 2017 13:04:49 -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=S4iYPQ5M; 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 052E6689E88; Sun, 8 Oct 2017 23:02:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A89C1689E59 for ; Sun, 8 Oct 2017 23:02:12 +0300 (EEST) Received: by mail-wm0-f53.google.com with SMTP id b189so17613967wmd.4 for ; Sun, 08 Oct 2017 13:02:14 -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=/6QAAw/KxOLkzTEK55ewoe1M7HSYJpyw9S14pR6YhRo=; b=S4iYPQ5M7h9JhNVQ80F20kyhYwRlhMSF2n1haa+OuUMZhis2CcJH8Zr+E+kj2+NGRu QydMuXZpXTaf3vT4qR8gqUxIuMVNqOMedY3mfcn/FZNomTj/y2HtUiPdVXa/SW2v7Xya iFXOG7ixeqz7ndnRAzWChjGlePZGwaUQvP+wTQtkf7Bfv3A5HTHJ1QVIrpbTAP9VuNXc TRtUwLuLvK1ylt65+yNl6R4R+gFG+7KHi+1NCcA3Yc0K4qSP0ZlQOAkRQfwdC8bg4ImF z4rZ3IodzVpSLr9ZaMmyx2RHq0XhhisHuWPDhB2ogMEhJmYqRw4aOzwNSbKogCi2Olza F88Q== 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=/6QAAw/KxOLkzTEK55ewoe1M7HSYJpyw9S14pR6YhRo=; b=Gumn39xJOxdNV62XGtzojGarulCCLfbcZ+7IoVfj7WGw/gr2qVvGMabA1IZYXcHoOl uGK1TWj1W61MVKgEEqBC2QKupW4+f/cyRbQk9Kd2HwLnyePr4n14MoGQOuez6ZH8rz5q A6RszL9PiAInnvc8i3XQFwVILBgs13zaQE5QPpTFtEA4Xd850jVoh6W+3+sQQQZcMLht 2sxBwO/GahTIz2mtE9X/Lvggf0imgPIvA9ISN8ty5C1TULlUEKKtQLVLvWMk+s8/Nq7m /2bqb3vTaqu8cYs+t7kHq3Y+fi6ko+V6OXzxvkvtV+Mdclr2o68EQqcpVMm/3JdIQ12c ApMA== X-Gm-Message-State: AMCzsaVHshdoyP47rJUHeXht7khKVFHkqQnHmbmzfa5lRrQuYL25yR+i Knc4zkVlJvKBI5qC2BqTFio8MboP X-Google-Smtp-Source: AOwi7QD6lyEqIbLzy6D0UG02/FwFbbV/6BdHCQKxFx3OCccLSG7MtMZJfKzZyLl5kUWY/zIxxZBUzg== X-Received: by 10.223.171.5 with SMTP id q5mr8278482wrc.48.1507492933628; Sun, 08 Oct 2017 13:02:13 -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 x49sm2897856wrb.25.2017.10.08.13.02.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 13:02:13 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Oct 2017 21:01:50 +0100 Message-Id: <20171008200154.4873-17-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171008200154.4873-1-sw@jkqxz.net> References: <20171008200154.4873-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 16/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 8ca82df084..d87485d5f0 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; }