The branch, master has been updated
via cd4b01707dd8275fb6f77e9a4d5ddd6fb02eaeef (commit)
via 0de3b1f3588e1fc9e292098902ac79d8dd9792bc (commit)
from 2e1d702cfc5c530c213361e6a1b77dca847a30e7 (commit)
- Log -----------------------------------------------------------------
commit cd4b01707dd8275fb6f77e9a4d5ddd6fb02eaeef
Author: Zhao Zhili <[email protected]>
AuthorDate: Sun Sep 28 17:35:41 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Oct 16 11:22:37 2025 +0800
Revert "avformat/movenc: sidx earliest_presentation_time is applied after
editlist"
This reverts commit 301141b57636c4430e7440e8ff4956daf9cb0fb3.
cluster[0].dts, pts and frag_info[0].time are already in presentation
timeline, so they shouldn't be shift by start_pts.
Signed-off-by: Zhao Zhili <[email protected]>
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 067d38b14b..b76d56dac4 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -5690,8 +5690,7 @@ static int mov_write_sidx_tag(AVIOContext *pb,
if (track->entry) {
entries = 1;
- presentation_time = track->cluster[0].dts + track->cluster[0].cts -
- track->start_dts - track->start_cts;
+ presentation_time = track->cluster[0].dts + track->cluster[0].cts;
duration = track->end_pts -
(track->cluster[0].dts + track->cluster[0].cts);
starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;
@@ -5706,9 +5705,6 @@ static int mov_write_sidx_tag(AVIOContext *pb,
if (entries <= 0)
return 0;
presentation_time = track->frag_info[0].time;
- /* presentation_time <= 0 is handled by mov_add_tfra_entries() */
- if (presentation_time > 0)
- presentation_time -= track->start_dts + track->start_cts;
}
avio_wb32(pb, 0); /* size */
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index 5c12aeb29f..f2b95ea957 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -101,28 +101,28 @@ write_data len 1223, time nopts, type header atom ftyp
041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init
write_data len 1004, time -33333, type sync atom sidx
write_data len 996, time 966667, type sync atom sidx
-69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag
+5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag
write_data len 148, time nopts, type trailer atom -
write_data len 1223, time nopts, type header atom ftyp
041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init-discont
write_data len 996, time 966667, type sync atom sidx
-69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag-discont
+5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag-discont
write_data len 110, time nopts, type trailer atom -
write_data len 1247, time nopts, type header atom ftyp
80511a51d1ac9cde62337eed7176ae03 1247
delay-moov-elst-signal-init-discont-largets
write_data len 996, time 279621233333, type sync atom sidx
-471fc64644a6bf4065c489fe4e04be7d 996
delay-moov-elst-signal-second-frag-discont-largets
+dc695d65e8a0cdafee28acd8a5ccf81a 996
delay-moov-elst-signal-second-frag-discont-largets
write_data len 110, time nopts, type trailer atom -
write_data len 1223, time nopts, type header atom ftyp
write_data len 2572, time -333333, type sync atom sidx
write_data len 996, time 5166667, type sync atom sidx
write_data len 148, time nopts, type trailer atom -
-5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr
+d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr
write_data len 1223, time nopts, type header atom ftyp
write_data len 2572, time -333333, type sync atom sidx
write_data len 996, time 5166667, type sync atom sidx
write_data len 148, time nopts, type trailer atom -
-5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr-noduration
+d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr-noduration
write_data len 1231, time nopts, type header atom ftyp
write_data len 1500, time -333333, type sync atom moof
write_data len 1500, time nopts, type unknown atom -
commit 0de3b1f3588e1fc9e292098902ac79d8dd9792bc
Author: Zhao Zhili <[email protected]>
AuthorDate: Sun Sep 28 17:23:05 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Oct 16 11:22:37 2025 +0800
avformat/mov: don't shift sidx_pts
sidx_pts is already in presentation time, so it shouldn't be shift
by sc->time_offset again.
Signed-off-by: Zhao Zhili <[email protected]>
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 922e001e5e..a962594990 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5845,7 +5845,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
} else if (has_sidx && !c->use_tfdt || fallback_sidx) {
// FIXME: sidx earliest_presentation_time is *PTS*, s.b.
// pts = frag_stream_info->sidx_pts;
- dts = frag_stream_info->sidx_pts - sc->time_offset;
+ dts = frag_stream_info->sidx_pts;
av_log(c->fc, AV_LOG_DEBUG, "found sidx time %"PRId64
", using it for dts\n", frag_stream_info->sidx_pts);
} else {
-----------------------------------------------------------------------
Summary of changes:
libavformat/mov.c | 2 +-
libavformat/movenc.c | 6 +-----
tests/ref/fate/movenc | 10 +++++-----
3 files changed, 7 insertions(+), 11 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
