From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F27A04B2D2 for ; Mon, 3 Jun 2024 10:25:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4929D68D689; Mon, 3 Jun 2024 13:25:48 +0300 (EEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38F0668D4AF for ; Mon, 3 Jun 2024 13:25:42 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7025c5e6b94so1011878b3a.0 for ; Mon, 03 Jun 2024 03:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717410339; x=1718015139; 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=Qg9UTLm/dSWYqzMSKlQYSgcgR5/y1yluY7gYcl0evPg=; b=IkjAwwgl9kk0OQsPutHbfwgcVHnFcHax4riHrryWgNMH5jkaQUf0rSUUJAmBfQeIe3 V4UL/orW4BuPTjd2v3onwukVTwIkAixxR0Z7Hcr4AOT4h4OeL3XsNTKxXdGxA4hqN+Nh OkMj2zb8skDHyqxQ3Ygp5jdSFZF//hcclCw0lphvZcKZdpnFJGf0eqAfYcC+6Psn4Pb9 kIv1sCSCdQQR2AQi8lMVXPu9vayiy1BlmnpDr1q7dZ9JMHdLWrIw2r/Z5w06uZchOHmT oEiHY0fAYjHJ1vFFXK7EpEJB+CVjKfzrdhAWCuq4SRYdSlL7YnTj2Ra9WU2ZIxsBpnGG QnfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717410339; x=1718015139; 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=Qg9UTLm/dSWYqzMSKlQYSgcgR5/y1yluY7gYcl0evPg=; b=JgbFFWT0G9pU5awg7rhMOhSOB3qoyLxZog28wdMNg/7KkGFi15qsuQmr3u40Hc2K6H cGoYkCGPt97hMNH/nUjaRbz6L+d9+d446a3nX5u9nU0MWP0fx9DYy2DBolJxNNEt3esC XKS+K2R6akIynYwMFS+jW6BZHV6n6d/TWabpI0Tgx0gU/jbZrz8wN4mtMsDnoZdaaKn2 J64Fqqpmd+6rLe2NflQacIVPlEhZH6p6U0Eb1NmRTRqJJ9qEa1Bswrci0k1QnCIfpARo Z4pnVb4A+cOpdu3ggTcJiVirIUPnpKSRsPfUkcfPD6lK46bdtPh+03cclfA9z2Nu72pi W3Lg== X-Gm-Message-State: AOJu0YwIK4k+PL9QvChWPIlre1nsny1TFcQz4Tra4vImLCi+YLnF6P/q pHZoOejItCLPmDuxtQXiBhptR3TtMuST/Kl8CrWpkwjsw9i8TNHADP6p0w== X-Google-Smtp-Source: AGHT+IFG63yf0wu+pdDSFaBR7h6Q5cnStNl2fAiqpDtJxZU11UPEounc6Va+ZNQi+WP2F2MAKp+Org== X-Received: by 2002:a05:6a00:4b41:b0:6e8:f708:4b09 with SMTP id d2e1a72fcca58-70247803b39mr9834332b3a.15.1717410339273; Mon, 03 Jun 2024 03:25:39 -0700 (PDT) Received: from PC.mioffice.cn ([43.224.245.231]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70254f99652sm3547471b3a.159.2024.06.03.03.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 03:25:38 -0700 (PDT) From: Shiqi Zhu To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jun 2024 18:25:34 +0800 Message-Id: <20240603102534.1134995-1-hiccupzhu@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Shiqi Zhu --- libavformat/demux.c | 2 ++ tests/ref/seek/lavf-al | 4 ++-- tests/ref/seek/lavf-ul | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index dc65f9ad91..c878839175 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1117,6 +1117,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, if (pkt->pts == AV_NOPTS_VALUE) pkt->pts = sti->cur_dts; pkt->dts = pkt->pts; + if (sti->first_dts == AV_NOPTS_VALUE) + sti->first_dts = is_relative(pkt->dts) ? pkt->dts - RELATIVE_TS_BASE : pkt->dts; if (pkt->pts != AV_NOPTS_VALUE && duration.num >= 0) sti->cur_dts = av_add_stable(st->time_base, pkt->pts, duration, 1); } diff --git a/tests/ref/seek/lavf-al b/tests/ref/seek/lavf-al index 4cf458835a..075bc4e627 100644 --- a/tests/ref/seek/lavf-al +++ b/tests/ref/seek/lavf-al @@ -20,7 +20,7 @@ ret: 0 st: 0 flags:1 dts: 1.047483 pts: 1.047483 pos: 23097 size: 2048 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 2048 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 43008 size: 1092 +ret: 0 st: 0 flags:1 dts: 1.987029 pts: 1.987029 pos: 43814 size: 286 ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:1 dts: 1.730023 pts: 1.730023 pos: 38147 size: 2048 ret: 0 st:-1 flags:1 ts: 0.624171 @@ -28,7 +28,7 @@ ret: 0 st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 13763 size: 2048 ret: 0 st: 0 flags:0 ts:-0.481678 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 2048 ret: 0 st: 0 flags:1 ts: 2.412517 -ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 43008 size: 1092 +ret: 0 st: 0 flags:1 dts: 1.987029 pts: 1.987029 pos: 43814 size: 286 ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 28812 size: 2048 ret: 0 st:-1 flags:1 ts: 0.200839 diff --git a/tests/ref/seek/lavf-ul b/tests/ref/seek/lavf-ul index 4cf458835a..549e5c3d19 100644 --- a/tests/ref/seek/lavf-ul +++ b/tests/ref/seek/lavf-ul @@ -20,7 +20,7 @@ ret: 0 st: 0 flags:1 dts: 1.047483 pts: 1.047483 pos: 23097 size: 2048 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 2048 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 43008 size: 1092 +ret: 0 st: 0 flags:1 dts: 1.987029 pts: 1.987029 pos: 43814 size: 286 ret: 0 st:-1 flags:0 ts: 1.730004 ret: 0 st: 0 flags:1 dts: 1.730023 pts: 1.730023 pos: 38147 size: 2048 ret: 0 st:-1 flags:1 ts: 0.624171 @@ -28,7 +28,7 @@ ret: 0 st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 13763 size: 2048 ret: 0 st: 0 flags:0 ts:-0.481678 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 2048 ret: 0 st: 0 flags:1 ts: 2.412517 -ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 43008 size: 1092 +ret: 0 st: 0 flags:1 dts: 1.987029 pts: 1.987029 pos: 43814 size: 286 ret: 0 st:-1 flags:0 ts: 1.306672 ret: 0 st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 28812 size: 2048 ret: 0 st:-1 flags:1 ts: 0.200839 -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".