From patchwork Tue Jul 5 15:25:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 36674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3563126pzh; Tue, 5 Jul 2022 08:25:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sJZkPTMJL9RRV6jX/wGwr0RT4dFXHrqKE4oTYSr9qyVZV0UlOVCv+IEbQJdDRicMq5gwsi X-Received: by 2002:a17:906:739d:b0:722:e94a:24c5 with SMTP id f29-20020a170906739d00b00722e94a24c5mr34008080ejl.734.1657034756593; Tue, 05 Jul 2022 08:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657034756; cv=none; d=google.com; s=arc-20160816; b=jxGGEMLmldor1Q+t9sXeIUCYgn4xUG7VXlD+o0s7fM8sks09I2HLAiOjbvMqTL+iWK vvFCEwtMO2bAaLcWYymZO5nzVWzZ5WO3a/N9TY+G/lec+NGzbKw30T8jiUnRhgrGiHwK j1PlIV5wKPp8TAAybfAZpHRDdLxPISerQBfR7XsAAHJ22LfeowcNLn3Gult5RIWJOoYA ZGTPRt24JHvst3vV0uHxMvbfcC5Nd+BH0EIO+/EuF1uyNYNtpA5g0MTdaFWdc+6NL9K6 i9MUhZglXTpTRApZrSuUM2/PFb58FQHqAvnuzwg4tqtGqXOT+le1Ah/hNhmmE2AtHkge 2e+A== 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=jbA6XXLW4yeNIwstTabRvY7VercgQLFJaff358pu9gg=; b=bC6/IM42g+9GpR1mDQDvD03dKKeZQlR4iW+qrHj8PJHQbNn5uxnsd+TPrDMAIYxS3i 0h592KcSIf5SGfEMIDc17F3OJ3yGNZiTtsE/EPJRMU+thZuqX3vMyn3GOBO4VdGc08Ch XaeqHSgu+ZvuyUBDOJPCpgYm2pSAXlf1A9KfJe+gGRwrt56U0i+Ll3VUBfDkOWUZGX5z PCpdzf0Bsilgs/P7CI5odJL2GUJZ6voH+qzoyY5ylOhc8U/KTBX+ZvE+Z+rT4a0r32Dh 9udehqZs9bOq84cb1TsjP5IQeb8bfmgxefJitxowTcGXjj1InVObtUbdvSQGk5W+hHUe bRfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=E4+lOtVf; 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=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g14-20020a056402090e00b0043a0ca47337si12796282edz.185.2022.07.05.08.25.54; Tue, 05 Jul 2022 08:25:56 -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=@rothenpieler.org header.s=mail header.b=E4+lOtVf; 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=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD92C68B9F3; Tue, 5 Jul 2022 18:25:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127A268B9B9 for ; Tue, 5 Jul 2022 18:25:45 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id A36992003AF; Tue, 5 Jul 2022 17:25:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1657034744; bh=tudsosj4EoSq+mObAThTKEBfNyujGMmIyHaItZQcOXw=; h=From:To:Cc:Subject:Date; b=E4+lOtVfD6qFqJcVLQPHX4J1gmA+jYuYSLekhlW0ODbWuK+XxYEw4hPBLevhtxp1h exsEn2UsBHB1hadPXa5aZfL3EdinirmjrNTAm5TxA8MeGngIDRurxY7ZGjF/IBQV3k v9FIr9BG8R6b9y3CqXSc15wm1mebg9gn5d4B5jXupScBiE5CNYZ8DIlP9I9/mWK3Cg CstPLayTbWvRgP6FUZBUXaiwulKrsNtXKRwmXDgpvSqZwg5e9bLslXT8g7dK+lSaFI 6lNh3W8j52FwSqSdFihOvK0KRjSzfdpIXXoKDtFdPgsCq1BBddMxdIrpfxBECGYNji Hvrf8lx1Ym/Gw== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jul 2022 17:25:26 +0200 Message-Id: <20220705152526.5122-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: log correct filter timebase with debug_ts 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Y6We5L7/cHZ+ --- fftools/ffmpeg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index e7384f052a..6ec28f3019 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -766,6 +766,7 @@ static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, { double float_pts = AV_NOPTS_VALUE; // this is identical to frame.pts but with higher precision AVCodecContext *enc = ost->enc_ctx; + AVRational filter_tb = (AVRational){ -1, -1 }; if (!frame || frame->pts == AV_NOPTS_VALUE || !enc || !ost->filter || !ost->filter->graph->graph) goto early_exit; @@ -774,9 +775,9 @@ static double adjust_frame_pts_to_encoder_tb(OutputFile *of, OutputStream *ost, AVFilterContext *filter = ost->filter->filter; int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; - AVRational filter_tb = av_buffersink_get_time_base(filter); AVRational tb = enc->time_base; int extra_bits = av_clip(29 - av_log2(tb.den), 0, 16); + filter_tb = av_buffersink_get_time_base(filter); tb.den <<= extra_bits; float_pts = @@ -798,8 +799,8 @@ early_exit: frame ? av_ts2str(frame->pts) : "NULL", frame ? av_ts2timestr(frame->pts, &enc->time_base) : "NULL", float_pts, - enc ? enc->time_base.num : -1, - enc ? enc->time_base.den : -1); + filter_tb.num, + filter_tb.den); } return float_pts;