From patchwork Sun Apr 2 22:57:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tt2468 X-Patchwork-Id: 40974 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2304556pzb; Sun, 2 Apr 2023 15:57:29 -0700 (PDT) X-Google-Smtp-Source: AKy350Z8RueBcu/O98UmCifMZNsofwgyF5pfmsJATmo8rxG/SNZagxyJ9gvP8u3pFI8PbBSTzFxT X-Received: by 2002:a17:907:3183:b0:947:76b4:f243 with SMTP id xe3-20020a170907318300b0094776b4f243mr13606211ejb.39.1680476249712; Sun, 02 Apr 2023 15:57:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680476249; cv=none; d=google.com; s=arc-20160816; b=B2SKRpB5pTZUPlOOdQQqmcE4huCYxDAzgWaIdbxpvTWNlz88O9METmtGKp6LgmBoqV oZboKOdNl4SChhED1aJdEJkyIv8sSUoSglgikWEWXV4dzHvOosnUjXQSCun7Gipf4Fon kg+kpaQlvcwAcUcQm4heOACj6SqlbOtLRLoBVA9Io5kvy95Cfx2uWXXChTj3s+dE4Fjv /joKaM1pfvxxIqrNyv4mUnc3WO415CDOducb422uBNw9IOoHuX3BUaVwRVbTpmK0FJ+Z eWTRoL3cjE7dB3dm7ZqdprmKK3bDlNjGqUdh8zP8+4XbQNZ5ZkutG5WXOtYWS+aKha7q MdAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=glpLXuyaVvJqMNJIyACfY2R1/WbkhZlW9MpJfXLPisk=; b=DPb5LRojkPYe62SsuQdkJJsStJ6lU7Ym4QhPVnaYMmsBqo+Lh1utEyAYZQMToltF6H EAzJpioCxeFrv1I5GYk5d9wUXLZKtol2mzK7JNDbxRW6gcqpyt7FhNLubUobXxn/o9yn 6QvF1Y3bV+SOgT/1D7KCp4hUwj/JxFzFf5sNytfUaUqPs3DkUCA+V2F7nnghdMQr3KpS 3dYVDvaqT65Fv4K8s/vR/PbBzMADpSpjqE1t2h8oNH+8JTWwnbsRZiamjJXrnNfWAmx9 JdPakrmSaPKzdPzW/OL0afGeTWxUM2U1fzwGxQXsirYiGbnv7TlPwRFjuA6KsY7DZdXw BldQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@irltoolkit.com header.s=google header.b=F+B8ngE1; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=irltoolkit.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b11-20020aa7d48b000000b004bd0d14881dsi3537444edr.90.2023.04.02.15.57.29; Sun, 02 Apr 2023 15:57:29 -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=@irltoolkit.com header.s=google header.b=F+B8ngE1; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=irltoolkit.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6431468BDAC; Mon, 3 Apr 2023 01:57:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D60A068BD47 for ; Mon, 3 Apr 2023 01:57:19 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id iw3so26316958plb.6 for ; Sun, 02 Apr 2023 15:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irltoolkit.com; s=google; t=1680476238; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HfQp6aN6jt1fjsVI+/9ZiP7mq1ubMAH7MbYz9VhrTmo=; b=F+B8ngE1xpyOJFYCElPs3IpHPcSw3h2Ifh848UuPXx5XsmCLmep1J/r9wdQ1MbHnAH FspRbv/X0XkZWlQMzzJVzY+iJ2h358oxuebJZkF8whKZ9FRj6YCOXsroKODyJBGcixeX uOPsGy5F9v4O7hccS88AxdB3VRi1qcgmxpDIySzQw6JwtR7zNaieiY6maf2UxR4bh6K2 ZgYlYNC6u1yaEL0aM7L6ug4bbx1/h8MbTcy2EqL9KcicJkiMu2eriJeTtLkgt1Gq0uni KAvlFjyypKzMJ8y6DHehWXxLm7LcLcvuiiC3NCM3GYCIUENRbaK4olcIiKRl0jaeuRsi tmSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680476238; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=HfQp6aN6jt1fjsVI+/9ZiP7mq1ubMAH7MbYz9VhrTmo=; b=Ab0EvpVyKOQtZ2mt6ePYyWMJcfyytjo5n+gfk5ELViWJk+IUSaXMNDDgF4ua7ggzh4 /zJge0jNddCyRqh3c1LT+ZkmBDfpqxzCrgmKIK1YQ7Rn+sGh5AwIRGBtdSelPoBsII7I 7O5/wS/D0zu6EZOiUpTH41ItqFX8VEwbT24vO8y+G2k4sFFc1aU2y3M9mTKn/0PoEGSO AR0xSC83zbl5Npbo2/6cKIRgPsVi/01eoK5nKQsdTIt/arPq2WLyA4ORuOGUUMKdmcs6 XO6YZveyVq8YlQU0aMVIrVcMpX+1Rk2ZbyVvhmqJzPkqyMnA47X/lQJ3Ui6duSvKmC2r jkGQ== X-Gm-Message-State: AAQBX9eOcUQL06GFgb7pz1MXaSDSRRU26+YbR26BwA0ucOJUib1MzUkw fLUdXsOvTHHPWnV5L5whTWn6jhKz1m9oSGjTBRw= X-Received: by 2002:a17:902:ce8e:b0:1a2:940c:e452 with SMTP id f14-20020a170902ce8e00b001a2940ce452mr10292941plg.9.1680476237648; Sun, 02 Apr 2023 15:57:17 -0700 (PDT) Received: from u30-server.. (2.53.ultimate-int.uia.net. [66.146.53.2]) by smtp.gmail.com with ESMTPSA id m10-20020a170902bb8a00b001a1d553de0fsm5170218pls.271.2023.04.02.15.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 15:57:17 -0700 (PDT) From: tt2468 To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2023 15:57:14 -0700 Message-Id: <20230402225714.366565-1-tt2468@irltoolkit.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/nvenc: fix b-frame DTS behavior with fractional framerates X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: tt2468 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8fPc0BWmYWmA When using fractional framerates (or any fraction with a numerator != 1), DTS values for packets would be calculated incorrectly. --- libavcodec/nvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 9acf3e8697..debc8326ae 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2266,7 +2266,8 @@ static int nvenc_set_timestamp(AVCodecContext *avctx, dts = reorder_queue_dequeue(ctx->reorder_queue, avctx, pkt); if (avctx->codec_descriptor->props & AV_CODEC_PROP_REORDER) { - pkt->dts = dts - FFMAX(ctx->encode_config.frameIntervalP - 1, 0) * FFMAX(avctx->ticks_per_frame, 1); + pkt->dts = dts - + FFMAX(ctx->encode_config.frameIntervalP - 1, 0) * FFMAX(ctx->init_encode_params.frameRateNum * avctx->ticks_per_frame, ctx->init_encode_params.frameRateNum); } else { pkt->dts = pkt->pts; }