From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1756D4BB49 for ; Sun, 28 Sep 2025 10:05:05 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'UU0RiWpk3Y9PUHWLYL9zXobum4fcaeN18XZl2SqyTG0=', expected b'p/s85Ay54ZmIiGoD+/rRMzD7fnRQcZ+DhRNcTex7reE=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759053895; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=UU0RiWpk3Y9PUHWLYL9zXobum4fcaeN18XZl2SqyTG0=; b=3NtR3JAsz9G4+WNosdXI5DTTa5cKMql8rJN80urYHbKYvGOY9nMK0QixpBCxYh/BIHbDb 2ziEuT0IULAeM4mWjvKN20qABZDC6AHN/Xx4U824ZCsNF+nvP1XFuiPdUoTkmiE23aCj/3E wL4NWrY69NuZQUEOx85bX86jxYjwIwPm6ucYC6leITwnEXj9zkLVSZpc2/yTaWasSECXBLg Bsy7m+nRpdE/fHl70BEHIHNPTcI/FbrQld+ZIo7mSz4GYK+BXtAuurJOu3hcOf23cjeHu88 lc1FudZwUBUVE9G2Mz/kvA7PEGRJcGsFdHO31d7DyXvAV7du90y6iTIwvp7Q== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1CF8168EB38; Sun, 28 Sep 2025 13:04:55 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1759053891; b=IaOplHBLqD4Qo/hcFga1jWf6PUH1fuNbGARhjdbN6TEU2O4rNFDRzSTQkRcoWjVtSCAJo uD1gamHJnmqzMGglFbEJDhZtgFyO3BBhsiUDokqdSg4yiJJhUPClo7KUanS1QvfmygTAEeN CzmROEEn/hPLeEVou1CMLlqh2aVcIu7312iMl7BYCyjWA+iQZi1vBXxu9ZAYPE5io3yE334 sQWczw4wcqItwgj1y1obf45icHG6x2mqCcnsA/L0WRWxu7mW4JQuInCfm6z61ewTTtFaPr7 06ratxh+Huewow/xtLQ03/nTV1+b3LuPK5ZTReWnyPhMNjm/mdPg00e/AqAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1759053891; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=wHKjw/8H/HmuX6TpLLXWFNwjrHnzACTDvA+tVKQN/PA=; b=lOzCNqGCHJwDshxSFdliRIfD/R9eobVeH45aJYzwGAgf6DRnjLWNSaEYbfM4VHKChqlwH SWgulD+tKww4aNo+/6XPTQJ0lcUBhsTIY+WiUIGYIsq716n/oXjXq6OLCpsW0O00DLyeaH6 B5Y41LuiG7TafatzDtRKOFVZw9nvD5W3VyWpxjErrSwRWGmv3WUwzVW6hgtw5GnlrmL7KZt EOqkpmRsWgJO+hXtq02/rBHsfzJ8JjXl6RyAVLyNxRIRmYRnKf1y/pp4DXraqKTlepkhcCY hJv/5BVK5hOv65wUY7YZnYg3r2SQhJVqRGg1sChyiGxyBgwgO5c67nNPEOmw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759053883; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=p/s85Ay54ZmIiGoD+/rRMzD7fnRQcZ+DhRNcTex7reE=; b=Hv+5zm78hlXND/laLRMTazzFI5x68DsR20lXaVeacN52jnc/IV6SMOQmWxIMQIFYMA44F DnS1axhbugjSPQw3px5pvRYq5TdURRln7DB4QKMJKpwNUX/fI1RcE7v1kDwM6JCFp5hOESj atv56sBk4T06oNiyT6u5otfHzo7KB6sQp8cBwZNcJSZky6P5ZbKmHqcOKC9Uw/H06grdwCD st6e5B/PMnzY5vccinVf+MsUUP5QQAmLfJu3pHsHUUHI2K5VbaI++WBpNlGfBMtanqxSkKB uIG3nJ/BrsF35bAOTtmKwx5whzaTUOi3zcm5oG3kNg0v2ox0iWLxFAPBHu0A== Received: from 13289e625de8 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E231468ED41 for ; Sun, 28 Sep 2025 13:04:43 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Sep 2025 10:04:43 -0000 Message-ID: <175905388408.25.1238122908664940952@bf249f23a2c8> Message-ID-Hash: O5EQYSAIY2P2QXCXQNEJX2ATBP6CQP7K X-Message-ID-Hash: O5EQYSAIY2P2QXCXQNEJX2ATBP6CQP7K X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] libavformat/mov && movenc: fix sidx earliest_presentation_time (PR #20623) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20623 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20623 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20623.patch sidx earliest_presentation_time as the name says, is in presentation timeline. I made a mistake in 301141b, which intended to create presentation time, but finally created media time. There is a bug in mp4 demuxer, which did the reverse: it minus sidx_pts by sc->time_offset to get presentation time, while sidx_pts is already in presentation timeline. This patchset fix mp4 demuxer and revert the bug in mp4 muxer. Muxer test: ``` ./ffmpeg -f lavfi -i testsrc2 -f lavfi -i sine=sample_rate=48000 -af [1:a]asetpts=expr=PTS+2*SR -c:v libx264 -bf 0 -c:a aac -movflags cmaf+global_sidx+delay_moov -global_sidx 1 -t 10 out.mp4 ``` Check editlist and sidx. Demuxer test: ``` ./ffprobe -show_packets -use_tfdt 0 out.mp4 ./ffprobe -show_packets -use_tfdt 1 out.mp4 ``` Check the first audio packet timestamp. >>From 9f115aa8b1c043a0af15887babef7b31ac183117 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sun, 28 Sep 2025 17:23:05 +0800 Subject: [PATCH 1/2] 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. --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7fe4678234..9ce066a9a2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5839,7 +5839,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 { -- 2.49.1 >>From 7d3ae113fec5597e8a7b7365d2cc402fc7f39d36 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sun, 28 Sep 2025 17:35:41 +0800 Subject: [PATCH 2/2] 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. --- libavformat/movenc.c | 6 +----- tests/ref/fate/movenc | 10 +++++----- 2 files changed, 6 insertions(+), 10 deletions(-) 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 - -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org