From patchwork Mon Feb 6 01:22:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 40288 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2979830pzk; Sun, 5 Feb 2023 17:22:40 -0800 (PST) X-Google-Smtp-Source: AK7set9gXIWre0Xln12flrB8r7N2W06+GgIVKPmxcIjMF9Rwt3rh4m1wTUocXW9jnNP4yjm7GQOy X-Received: by 2002:a50:9ea9:0:b0:4aa:b347:7da6 with SMTP id a38-20020a509ea9000000b004aab3477da6mr1529636edf.3.1675646560778; Sun, 05 Feb 2023 17:22:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675646560; cv=none; d=google.com; s=arc-20160816; b=nupEosAlP0AxCZPJBePCJOV1D8Jw8UIiMrRoOvK8OptK5hAeKWqtVMPu8UVTXxPlZd yHQ2P5dS9MyWEevujfsRbgbf8r36cJGcUl9KD2GHs0ESNZ+OjsksAxn1sk1M6Qu5B50L /ViduzQek4Jh6xoY8UCeJsrRK8XPjy0fsKW8vbtrobwnGDU+zL6/9+vFjj7F9xbSifF6 Pcvbx9a8ZOQAJsU+SpFkHFatqWYCqkI5IUdumGIjTb2iu31M6+tZin7ZmZDJt/NrhYUc NpgcZsZs5dmBkUYvJG3rHdH54zYc6FTe7n9wh0udtyXPlmmIrnrMIIWhKY6FaYMrP5C5 VOmw== 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=Ic5ySpNgQUcS/Lk09Bf7LV0rzhNkyKsY66k7TMcI9Oo=; b=rjn0bK/MayebneH5i4QQ1QHHbSr2UsE/+jSjXL2ggg2bOMSMlYR4sKompR9vP0Gl0b aEY3GE7+oFeZbOdgYvS9jDMvmmfrFmjlEdV00voOua08R7wL+L+2s17y77p6O7Tvo1Ni CdF5d95WyBFigV1W9FBTLtChIUy4/buPPl7W2VP3r5ktrROQ4TRkdO1DuoHI43JWaIxg Scte5FCQKAJrKVE8dbSyXKOii6yoJ38+eaXetqXQ0Tgo1cJ+MSq+IU725F/tmYi3iB6z 5tfvZV4P/Q60oC6aiz72QyIAUKkGsSiwcLspYJlsiFykyeIi71+xiKUeYVAneZJb6Ykl B+jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RnWyZlNb; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dy10-20020a05640231ea00b004aa9f4f8f53si6250347edb.124.2023.02.05.17.22.40; Sun, 05 Feb 2023 17:22:40 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=RnWyZlNb; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62D9868BE60; Mon, 6 Feb 2023 03:22:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F28A68BCE9 for ; Mon, 6 Feb 2023 03:22:29 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id l37-20020a05600c1d2500b003dfe46a9801so6182471wms.0 for ; Sun, 05 Feb 2023 17:22:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iWt8ixD6hvHiVwjwWbJfIh8JkId0C7RwbJ+BvDHEu4w=; b=RnWyZlNb9BvUlO3O7UdM17g5u3Z5ck+YuuY637igaI7GTJvybjMI7qb74u3/mNKajd j7CN9pVxmn8v69H7Z4RbPLaGM1cn2t1AMhPyApEi9qGA8r9sPMfcjHLsfDjdYYuwOHA7 z9LAhxT+sRf8TFVGezpnbZn9jwmlvgtycJr4Xt2tZWLkU4SsDyp33X5Daxr3LFu8u30z 1CeEQxVB1zi+mdd7qCO0GFsuuQXMFwSxEdeyNlBDpsyIMYs4HWFtuUNR2YwZp8soR2v0 jJdG4DE14hgsqw0eLfE+n2ANgjT0uz+RkJHCHvnAHMcquDCxRC5JpLVDsYpqlVjCV/zJ z5hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=iWt8ixD6hvHiVwjwWbJfIh8JkId0C7RwbJ+BvDHEu4w=; b=JYPWaCtdlP+Gyi+z0LqOaYi8Bekg1vn9GofvPZldNktlg2BleTi7FjyYSdFrMBexXi 1ZbHSliVDuNcL1qmQRFkMkgmZ0Doq+9YWoQjp4Q3zGIkLDpjtFEtcjpXHm8sNO6UCg5z +dv+tw7VQYnZdsOT646jxWJmjb6ayghcMJ57hBC2c/f9bORi1WeD9YuSfEamGRz2ea3p 179ExZmYGOmMmBte1XDTXrNe89/yUgT1DwnSPWDHE19IgkeyH3CSTTbCpcUeLrzouv6e 6cOJfFdFQinCghBjesaVjE4P9hmxPiU9Idy7EyjGDMIqmv+TCl2ZN4GPj5maYBReRPd5 7JSg== X-Gm-Message-State: AO0yUKVP1HLviXNhv6qZ0azH/D3c5/EL+kSoEF9fAnihZXnx9ga5nJYc dKZF5YZWCArgp+PcHZdPQHHODMHfPPo= X-Received: by 2002:a05:600c:1d03:b0:3dd:1bcc:eb17 with SMTP id l3-20020a05600c1d0300b003dd1bcceb17mr17927353wms.28.1675646547339; Sun, 05 Feb 2023 17:22:27 -0800 (PST) Received: from mariano (94-37-133-75.adsl-ull.clienti.tiscali.it. [94.37.133.75]) by smtp.gmail.com with ESMTPSA id ip20-20020a05600ca69400b003dd19baf45asm8963175wmb.40.2023.02.05.17.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 17:22:26 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 004DEBFB73; Mon, 6 Feb 2023 02:22:24 +0100 (CET) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Mon, 6 Feb 2023 02:22:24 +0100 Message-Id: <20230206012224.338931-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] ffmpeg_demux: show fixed timestamps in ts_fixup 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uyrWf4AcdGg8 Help debugging. --- fftools/ffmpeg_demux.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 4b5c62b0d5..71ce7d9a02 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -173,16 +173,19 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) const int64_t start_time = ifile->start_time_effective; int64_t duration; - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d:%d type:%s " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s\n", - ifile->index, pkt->stream_index, - av_get_media_type_string(ist->st->codecpar->codec_type), - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ist->st->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ist->st->time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ist->st->time_base)); +#define SHOW_TS_DEBUG(tag_) \ + if (debug_ts) { \ + av_log(NULL, AV_LOG_INFO, "%s -> ist_index:%d:%d type:%s " \ + "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s\n", \ + tag_, ifile->index, pkt->stream_index, \ + av_get_media_type_string(ist->st->codecpar->codec_type), \ + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ist->st->time_base), \ + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ist->st->time_base), \ + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ist->st->time_base)); \ } + SHOW_TS_DEBUG("demuxer"); + if (!ist->wrap_correction_done && start_time != AV_NOPTS_VALUE && ist->st->pts_wrap_bits < 64) { int64_t stime, stime2; @@ -225,6 +228,8 @@ static void ts_fixup(Demuxer *d, AVPacket *pkt, int *repeat_pict) if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && av_stream_get_parser(ist->st)) *repeat_pict = av_stream_get_parser(ist->st)->repeat_pict; + + SHOW_TS_DEBUG("demuxer+tsfixup"); } static void thread_set_name(InputFile *f)