From patchwork Wed Jul 13 00:02:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 36766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp20652pzb; Tue, 12 Jul 2022 17:02:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1utNLMul5bOS/21pEWjznAFKNGA0vYHUyMz2dFbew4yL6km/cV8f9y64aQgdsEZKbKwlKhj X-Received: by 2002:aa7:db09:0:b0:43a:7353:94a6 with SMTP id t9-20020aa7db09000000b0043a735394a6mr955446eds.191.1657670559214; Tue, 12 Jul 2022 17:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657670559; cv=none; d=google.com; s=arc-20160816; b=xihSV78SAsm4qOaiEMDFza3T28b9FOdKW8cG7l1jMbD+lYEUJiWO0U9ANxc4rI9KXI CwWVXf/7tTYivyoME9IDVkFnakFGuDke15U91DPNEkxQQGFbeEFp4Jqq8iBSn4j45hJu yGaiVADFfVQjSndiDpu8W8CGWjg8e+GcJygcSH/HHcx1xiMB5DXySrU6w/3Qid43AWlP bSyR0E4tVMCnL+Ek4JOeKxeOp9DSws90YpqWwDllr+91Ml15z3cqwng/T1IWr3pUbW4a nW9t8bf1xADrR4ygYrV44FFmkKjW0nTneQ9IWu8Sr4CxAOR7r+VR6PpR2Z36MbT+TiHi UWeQ== 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=VGkkFzIWrO1aCczyXMSeOlB3U7yDOQ7aEIfHiHCaHFQ=; b=v6d8PuGCu5d0lCAZeHsHlyBcwcjWBWFBaBV0ET4Gyk6Cj8I2oCwkkrJcDkRUtUdSUD 9aH03Y2FD+iEzEsDraDjnXFSw9GWVezEv2GQ/eTQBakFlP/pcTjLyDaFN8wogcnrYCBi PR3gEajToBEiX27Z854ffYdHqG7wDrwT3RWM2z5esKVb7QLg+9P804XliLGs+ABjsRwh AGyXu/drvurw39rHgkd5aeN4BqkgD3OiN3Kzef3qxs5coE8YjT9lFb2bd4KgZhn/HZnj 02AwV+gMrdkZz37yjqLFA6cXArIW7gAI28tWk3zS7fsri1DFVdO/Gy0DR7NCI1cE2h67 fDDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jQOeRCLR; 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 c15-20020a05640227cf00b0043ae1b74e96si7972536ede.381.2022.07.12.17.02.38; Tue, 12 Jul 2022 17:02:39 -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=@gmail.com header.s=20210112 header.b=jQOeRCLR; 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 EAF8668B462; Wed, 13 Jul 2022 03:02:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2F9868B462 for ; Wed, 13 Jul 2022 03:02:20 +0300 (EEST) Received: by mail-ed1-f50.google.com with SMTP id y4so12104657edc.4 for ; Tue, 12 Jul 2022 17:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxtEA/Jp/ZvS4t2qdMlWGVRAjyYevpIu8VgGoYEqVds=; b=jQOeRCLRD+Ye3R+BraH/0Dx1uAd2l5r2/MX2Mhbs6PJmz/LUOd7hLa62XIG6p93rNr d61A/d3MHEZ/JJtF/3+TPEZmG15QFLWSKSc+YYgLzsmn0PRKeIAX2zWyxB61eXGQBcJO o3svr48aqagTRjtYaekLQiGmrbL8/eyOaV9jqMMUZ/1YSCNAR4Drrwnpja3oeATR3r0N A/+1HXh5uc1VSsCMxddBaqr+5XJ/eY3OiH083bqPBDEMgvb+DE1vkDpZkRtNd7SCu6T/ FIB/qiTtCvQgifItANr/BhdqGWDf6hg8wcuKKPnmMKN5lNux1Wp/b3p0rbrSOc5+mIRI O4WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kxtEA/Jp/ZvS4t2qdMlWGVRAjyYevpIu8VgGoYEqVds=; b=u+9gwyv5STaEuDRPw9QqyhVcWiPxjDCoV2km11yRkZcgndmQyqWABpGCxukyZTnz8u RtJggRqUftqRben3I8Y1gt9iXTjzYWwe62htMtg8Ri2Pq6uMplfFV/eHy0Qb5y6dDwSm 7ZsYhxYqOCScdPGEIle5Ooe/6ZHchl984hQVEaamW/ebhRhSFqck/b6pA8iw8fJv00O5 K2y3uP0wLd+btodlf/llGS0S3hKevapv3VXlq7qHk/d5BQp3A8I6cWItY86KIKSFYAXg UQSTBMo/cNsIk9j0NanKKkRRY4XWitI8KdQRLYitZ/tk5wVMmHjw1h+0pYTdWUGgDsQF HTpg== X-Gm-Message-State: AJIora/eJVvCECbgfFi1ZMnNhxDdz/mSdAfjEnPd2sqGSh5+B2KtXP+J ovNeG7UcuVt7gKdJcdr6RMxC3Bbgyt9/GA== X-Received: by 2002:a05:6402:12d8:b0:43a:6a70:9039 with SMTP id k24-20020a05640212d800b0043a6a709039mr905500edx.379.1657670540037; Tue, 12 Jul 2022 17:02:20 -0700 (PDT) Received: from mariano (94-37-131-182.adsl-ull.clienti.tiscali.it. [94.37.131.182]) by smtp.gmail.com with ESMTPSA id lc25-20020a170906f91900b006ff802baf5dsm4331190ejb.54.2022.07.12.17.02.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 17:02:19 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 05CBCBFA36; Wed, 13 Jul 2022 02:02:18 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Wed, 13 Jul 2022 02:02:17 +0200 Message-Id: <20220713000217.257584-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffprobe: use pkt->dts to compute interval ts when pts is missing 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: AmArTgtLs2Dy For some samples the pkt->pts is always missing, use the pkt->dts instead. Fix trac issue http://trac.ffmpeg.org/ticket/4427. --- fftools/ffprobe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f156663019..8824b1c044 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2844,9 +2844,10 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, } if (selected_streams[pkt->stream_index]) { AVRational tb = ifile->streams[pkt->stream_index].st->time_base; + int64_t pts = pkt->pts != AV_NOPTS_VALUE ? pkt->pts : pkt->dts; - if (pkt->pts != AV_NOPTS_VALUE) - *cur_ts = av_rescale_q(pkt->pts, tb, AV_TIME_BASE_Q); + if (pts != AV_NOPTS_VALUE) + *cur_ts = av_rescale_q(pts, tb, AV_TIME_BASE_Q); if (!has_start && *cur_ts != AV_NOPTS_VALUE) { start = *cur_ts;