* [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call find_stream_info
@ 2024-06-03 10:25 Shiqi Zhu
2024-06-04 0:16 ` Michael Niedermayer
0 siblings, 1 reply; 3+ messages in thread
From: Shiqi Zhu @ 2024-06-03 10:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Shiqi Zhu
Signed-off-by: Shiqi Zhu <hiccupzhu@gmail.com>
---
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call find_stream_info
2024-06-03 10:25 [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call find_stream_info Shiqi Zhu
@ 2024-06-04 0:16 ` Michael Niedermayer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Niedermayer @ 2024-06-04 0:16 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 1256 bytes --]
On Mon, Jun 03, 2024 at 06:25:34PM +0800, Shiqi Zhu wrote:
> Signed-off-by: Shiqi Zhu <hiccupzhu@gmail.com>
> ---
> libavformat/demux.c | 2 ++
> tests/ref/seek/lavf-al | 4 ++--
> tests/ref/seek/lavf-ul | 4 ++--
> 3 files changed, 6 insertions(+), 4 deletions(-)
breaks fate
--- ./tests/ref/fate/gapless-mp3 2024-06-04 00:45:51.981958561 +0200
+++ tests/data/fate/gapless-mp3 2024-06-04 02:15:01.740935194 +0200
@@ -1,5 +1,5 @@
d7e884aea266b63f1547f1ad10188c08 *tests/data/fate/gapless-mp3.out-1
c96c3ae7bd3300fd2f4debac222de5b7
-75bc539914297a191f40af2d737d7380 *tests/data/fate/gapless-mp3.out-2
-c96c3ae7bd3300fd2f4debac222de5b7
-ab21e0bd0c2d84426153d4cde919a1e3 *tests/data/fate/gapless-mp3.out-3
+b3c8c3d1ed0bf2b131cea783991cc4c3 *tests/data/fate/gapless-mp3.out-2
+6af69aebf2e5e5439ada6b0cf98dfca0
+b3c8c3d1ed0bf2b131cea783991cc4c3 *tests/data/fate/gapless-mp3.out-3
Test gapless-mp3 failed. Look at tests/data/fate/gapless-mp3.err for details.
make: *** [tests/Makefile:311: fate-gapless-mp3] Error 1
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call find_stream_info
@ 2024-06-03 10:22 Shiqi Zhu
0 siblings, 0 replies; 3+ messages in thread
From: Shiqi Zhu @ 2024-06-03 10:22 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Shiqi Zhu
Signed-off-by: Shiqi Zhu <hiccupzhu@gmail.com>
---
libavformat/demux.c | 4 ++++
tests/ref/seek/lavf-al | 4 ++--
tests/ref/seek/lavf-ul | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index dc65f9ad91..64b6a1757c 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);
}
@@ -1432,6 +1434,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
ff_reduce_index(s, st->index);
av_add_index_entry(st, pkt->pos, pkt->dts,
0, 0, AVINDEX_KEYFRAME);
+ av_log(s, AV_LOG_INFO, "++++++rdin add index entry(dts=%"PRId64", pos=%"PRId64")\n", pkt->dts, pkt->pos);
}
got_packet = 1;
} else if (st->discard < AVDISCARD_ALL) {
@@ -1620,6 +1623,7 @@ return_packet:
if ((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY) {
ff_reduce_index(s, st->index);
av_add_index_entry(st, pkt->pos, pkt->dts, 0, 0, AVINDEX_KEYFRAME);
+ av_log(s, AV_LOG_INFO, "-----rdfm add index entry(dts=%" PRId64 ", pos=%" PRId64 ")\n", pkt->dts, pkt->pos);
}
if (is_relative(pkt->dts))
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-04 0:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-03 10:25 [FFmpeg-devel] [PATCH] avformat/demux: fix pcm read too much when call find_stream_info Shiqi Zhu
2024-06-04 0:16 ` Michael Niedermayer
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 10:22 Shiqi Zhu
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git