From patchwork Sun Apr 2 22:02:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tt2468 X-Patchwork-Id: 40973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2285597pzb; Sun, 2 Apr 2023 15:02:42 -0700 (PDT) X-Google-Smtp-Source: AKy350bP/03I1/5sGSoBgGrofDVnqBk0S8FxpzvapZ8yLGenjtUViyZ5c2UFfHevu11HYJ/4Qp8b X-Received: by 2002:a17:906:da88:b0:948:1d57:9fc3 with SMTP id xh8-20020a170906da8800b009481d579fc3mr5406807ejb.71.1680472962358; Sun, 02 Apr 2023 15:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680472962; cv=none; d=google.com; s=arc-20160816; b=0zy5mCFOuZcu6dK+aJJUmHFgrsZV05gvy5mfyV0YqCdHQcPV0r2n5K7CXL8Ce7gX2P Wo6OL5hLqZAk0+nn7osUPngBQ5+ooD4gZqEPDpFGA2TAUkKFFXvZamZwVWEzN+vLgJeQ wiTMM2bzzjY5CWWD4VCfJkjP/dK7gg5WvbZGlnF0cDUYc3egeD97Wd74FUzGUfe/iShT t45MbrWAR/v2+B0ZanGYaC1zvUydQiKyVXCGPlOTYWixkmPBKHbr66/Jf8QpBNiYtA4z gPZyRwNmSZI/BI9ZPXvqAjHkGKMK1rYQtTdVrrZl0yzJ7PQV5gXcs1MJb4+4WUgfUois p9mA== 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=4kTu99GCiKVwnN2iwno4PoPr9rjunMvV8pbmXKK7Vns=; b=zWHSTLBbeMNp7o0/QKKR+HVC/1RPMjfKhPGbvDKFnhUmIAHiboNn+gc6U4o0lmIVcx qDpLdMkueBjiB+fBNKSpmm8ljNYXYXQy21popQQfXqYyDW6PAFgMo+XW0muC+Z/6AZ/G jNhkU0FyMmX6Sb01e4q28OoatqtggKWxcfLc0pTFER1IaHT7zZfTfCM918myhDsdUEOv b1mU273eHlLrDW/yNYPVKJa5ZiZ5Zqxf8wFGxg9ibzEG03pt/ZrzaIr9ofuj9qzScYKR w4MLKY/NRew6pwKLPosXo05XbbhVwyUIFxpXE+nFjQwwevT4adPb/1qPrb/slgyu/Txx 1ZFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@irltoolkit.com header.s=google header.b=gmu7moDj; 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 k1-20020a170906a38100b009333f8775a1si6091315ejz.182.2023.04.02.15.02.40; Sun, 02 Apr 2023 15:02:42 -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=gmu7moDj; 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 276BC68BF30; Mon, 3 Apr 2023 01:02:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48B1168BE86 for ; Mon, 3 Apr 2023 01:02:32 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id q20so6715590pfs.2 for ; Sun, 02 Apr 2023 15:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irltoolkit.com; s=google; t=1680472950; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2NTDCdi85nSnCoj+u6X1TUiSoG6B2l9nWYG47U6onuo=; b=gmu7moDj0NyxYSqL6nUxB9GWQr0O2MlxEUf37Mtv5bf9eGO1HBONKB013CDuPd8sFG 5xzhTY1uKuOAHjxj/brhqi8NmEyyT0YPb7zgVPawB08UEWFri1NnyRt4FkMulllM0ILf pSKFQvBrb/FTo6c20sz2eM4xivl+G1QlE6LFO9HY6La6+29a+YmzcShL6haGPp4uDyTq zMVISvpNhpm3itbLVJuYgoecRTJerUOXf1Q1O1bBkkRxw9698rtP+9+/YoJPpCNAYsLo +YFcTcJNSmnN74xlIj/lWs2jZDSchQCSnoscsb2F1wZaFgFPbCVmJjUKRCCv2zlzB5xo 0KNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680472950; 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=2NTDCdi85nSnCoj+u6X1TUiSoG6B2l9nWYG47U6onuo=; b=tvcScWBxYXxtBqRV0tdeKMRqbVykHV0ObEoC5prhbYkWrF34VCkUHu9pFg0ODtg4SB FFMsc+LyWSJitlzquD3AloKC63cKBN3EUipnMGLMmO8lcXTjpJhAVn/D9DjT53Kxp/pT b5fP4Oh56csPYbBAWmXGQusopjGEDw/Hch57fRbhVUtTCxs3tBoRV6fxPxdyT89cb8fU qbxW9Y+1rwFCyZ9ODyO1iN2yjKKrro4eDUzD9ak0h0dVogjkJI2DrRsauE/lgIJYeMlB gmmikW7bHJIjkM7dQVySUcEpVCLUYzwZZ1/Ol4nxyMkxFO1SQFPMxl8Ux33kgI5vD2j/ s6qQ== X-Gm-Message-State: AAQBX9dqPY8rLHgXip5AFqhqzpf0Gz+3HezbEjly1jjgHyIBcErqQU8N Iq4fqswDcQxbZwacF9EgeTMNSe9torc3TjPKct0= X-Received: by 2002:a62:3855:0:b0:627:e6a2:a85b with SMTP id f82-20020a623855000000b00627e6a2a85bmr31855831pfa.2.1680472950193; Sun, 02 Apr 2023 15:02:30 -0700 (PDT) Received: from u30-server.. (2.53.ultimate-int.uia.net. [66.146.53.2]) by smtp.gmail.com with ESMTPSA id p10-20020a63c14a000000b00502f1540c4asm4782551pgi.81.2023.04.02.15.02.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 15:02:29 -0700 (PDT) From: tt2468 To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2023 15:02:25 -0700 Message-Id: <20230402220225.342600-1-tt2468@irltoolkit.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH] 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: C7xEn85WWh9v When using fractional framerates (or any fraction with a numerator != 1), DTS values for packets would be calculated incorrectly. Signed-off-by: tt2468 --- libavcodec/nvenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 9acf3e8697..8b02856507 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(avctx->time_base.num * avctx->ticks_per_frame, avctx->time_base.num); } else { pkt->dts = pkt->pts; }