From patchwork Wed May 15 11:35:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiqi Zhu X-Patchwork-Id: 48895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1535730pzb; Wed, 15 May 2024 04:35:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWC7iJOOnp8tT/iefuebBBM6j3tgdz2R+BVAw43MIfNAtthb86hlOMrh7R2BdlbQkK0+nWdMU7R8bxjYXv1U0xTYGkqDN03YQUpYg== X-Google-Smtp-Source: AGHT+IFFQa2q1U4lTsY2EqZQ0jRrK/YMYSy9astHMiBOTzGOxZgWh6qbG8YG9pOltfBoQuv/BcEf X-Received: by 2002:a17:907:b84:b0:a59:9eee:837d with SMTP id a640c23a62f3a-a5a2d54ff0emr775595766b.2.1715772943633; Wed, 15 May 2024 04:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715772943; cv=none; d=google.com; s=arc-20160816; b=pFLWuz60jUQTFXgh1D9zzH6qn46FdqFNFUABwVXxYaOG4Bj+OVdZfKWzlrFTKJYFOb QP4SNnsQDnocfazIH4Gu/u6KgIdt7nyAXsVnYtBLCjcdqHTM5J3T68EFPzQ24u4FG188 hb7QKoupHJMu0gkUlYdJ2ogmSYjSqxvjClDifJIfIWqacGIsxJ3Ru6DffIwzXbxV5RTA QUrVQDEAXBTcrE+BR9Z9LVTHx0oLWro+UoxoeDrQv2u/YtnlFb2/pKUZf0052G2S2XBk LiOp7WeVgAMCrgp8eJLO5ILSIm4+5DEI9ZOweFpzhGB4g7N0QwJ07UK0Wqjdhj9MnBZM YdiQ== 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=IYLFHHp8yCgcrWyvpIYG7K/su5CVN12EmuTYWLgioWA=; fh=jGeylq5Cq8cixZoV2Zp7uaY6E5GFel41JHto3Y2hIBs=; b=BytWNz3Co1DjbDef3i2557ahCTJiiHfo3AeQEEjnLj3R9NVI4nG+nnnGnV1kbnUl/W o7/nbI1Lz2W6Q+TOXDo/nA03wPHvTo7N6YJB86pkjalldzWhEazQBUSx67kC+aB40Ei7 gRYiQgbEKd5hghUL76ldYpTHO8zBMAzI18vLgUV3LYAdUrgWDoC+UjQF1BIbDGQzd79x i9bcgan8++NZZP2ojy2X1+M0j/0LSKeQaikqmRDdIC//dbRNF2p7dSPddOIKtK0Et54Q ZQL8br6iQauJRnBCfdPTOEv+slb7qd+iL2jrEiODi2f8p38B7fRI4X/lQhMDxBAhAQy9 V7SA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XiC4bYUd; 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 a640c23a62f3a-a5a17b4c455si714832466b.442.2024.05.15.04.35.43; Wed, 15 May 2024 04:35:43 -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=20230601 header.b=XiC4bYUd; 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 7B62868D6D2; Wed, 15 May 2024 14:35:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8496868D422 for ; Wed, 15 May 2024 14:35:32 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1ed835f3c3cso58214815ad.3 for ; Wed, 15 May 2024 04:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715772930; x=1716377730; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kkC5ftEeJLsuJk6j13PgRhcl+JON4n3NjNcDi1crQOo=; b=XiC4bYUdFsT30n+bJe/OvKoD/v6RO+gY6mDDHd5oeS17dKYO0KiYzNqekZWWa4EZ76 lXgwUcEZ/kV0CPuRaeLZRFmQfzDVKEuJ++DpZdHkE4iUn38wm7HOfv7qBw1ZAYIvgItt Nt9ab3paxxOHWQjSz93xs7y5L8gC4lBhbgyXkhPHPOnb5PDHlb1ap6TD+iRyd1tWb+to L9TQi2plsa+SwT566Uwkyw3HaJO+DCKlJw41u/gvSAGruIJCgQsaJd2vszmxMLb03uyi YX6BkXRXn5ZX4wJ68IoUDosHy37oFEt/vpyGfeeVc209CvVcqTBp0gLXrQ5jRv2YRYrl lGZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715772930; x=1716377730; 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=kkC5ftEeJLsuJk6j13PgRhcl+JON4n3NjNcDi1crQOo=; b=iUbZHh3iCttfsuFvLnbCJTUvJJcLPoO/eZVQxhBGlGDB48bxyQMDxoF5Q6aj7KJkKX HNo85udHhi10qukIsq+24Kl3o72tMg5echcVkRMjnEQCG11reUtnI1vg+4VjHEzHa1bo lGNGfODQTNohsHYrEQrG8kGP9cr2faDjKPuuYFJVdHkBAvGHVbZYu1YtSu5c8of3nIVf fGrH/hJtrUsv7ro7yaCzdJoOBgutt190p6e1ZdnVgt3G7p+ni6lOIAwSgYyH9p8y7f4z 5dFgTWBsbQy6VLiL01wnjapZO0KKl4FBVKwNAJW4kPXZ+K0KN3PTS9vUAyRJ+8aD7X7E ngRA== X-Gm-Message-State: AOJu0YwVpMaAtvJU360rCcLzW6SGO7oL5NzLsP7ZiKqRzaDFvhiAwCCC Rh3LgT/5Ld9p2MFWLw83neRYQpVaa/TL/fzcCDhjsH6I+0P4d0VBdZaKzw== X-Received: by 2002:a17:903:2445:b0:1e4:3386:349f with SMTP id d9443c01a7336-1ef44049fe5mr200246065ad.51.1715772927760; Wed, 15 May 2024 04:35:27 -0700 (PDT) Received: from PC.mioffice.cn ([43.224.245.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0b9d40c9sm118794865ad.49.2024.05.15.04.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 04:35:27 -0700 (PDT) From: Shiqi Zhu To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 May 2024 19:35:22 +0800 Message-Id: <20240515113522.1921274-1-hiccupzhu@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/demux: fix sti->first_dts can not been update when excuting avformat_find_stream_info 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: Shiqi Zhu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oV0amkCdMWCt Signed-off-by: Shiqi Zhu --- libavformat/demux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index e19b8b6473..74be509c8b 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -856,15 +856,16 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index, uint64_t shift; - if (sti->first_dts != AV_NOPTS_VALUE || - dts == AV_NOPTS_VALUE || + if (sti->first_dts == AV_NOPTS_VALUE) + sti->first_dts = dts - (sti->cur_dts - RELATIVE_TS_BASE); + + if (dts == AV_NOPTS_VALUE || sti->cur_dts == AV_NOPTS_VALUE || sti->cur_dts < INT_MIN + RELATIVE_TS_BASE || dts < INT_MIN + (sti->cur_dts - RELATIVE_TS_BASE) || is_relative(dts)) return; - sti->first_dts = dts - (sti->cur_dts - RELATIVE_TS_BASE); sti->cur_dts = dts; shift = (uint64_t)sti->first_dts - RELATIVE_TS_BASE;