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 DC549409ED for ; Fri, 4 Mar 2022 17:27:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECF7168B107; Fri, 4 Mar 2022 19:27:00 +0200 (EET) Received: from out203-205-251-84.mail.qq.com (unknown [203.205.251.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D31AE68A8DB for ; Fri, 4 Mar 2022 19:26:52 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1646414807; bh=w8LABZMG81rXfTbHYCDqNi0mf6mlAPVcwboJa+HuANk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XyePihaITfKjLF1HB6SoLUFJSWHu6PwQT2GM4dS6eV3nBFkf8Biw2KJQ3J6rb8R+o k4mZisN61Yfi0Rn3AhGbfPTgr1MlE8aiv+qhnAzikyYgeQD2vwsxQdSTkHmrdYUP18 O47jEu+mNemVpbknj8jfiZcRyccVr1UsT1vXmggk= Received: from ZHILIZHAO-MB2.tencent.com ([119.123.75.91]) by newxmesmtplogicsvrszc8.qq.com (NewEsmtp) with SMTP id 6AC89471; Sat, 05 Mar 2022 01:26:44 +0800 X-QQ-mid: xmsmtpt1646414806t7puxni0c Message-ID: X-QQ-XMAILINFO: OOPJ7pYMv25tvvw61jfw+ij2uzHi1p7EhHXAeWaQ9h6plP3EhpXpqk4V6G6zyQ TEZuXaB0pdwLSXiTuzdTfV/VJDVGp46El0lh2C8O39f8mqZlJPykcSAnR+34BxAcn2ffcXeZflLt QkV5516OlIjtxuX694Fet98cGb1R4n5aGJgxb6vFK2eCKf8bYvN5MECly8oc+LbTNYoySFjRIwgd CIJgwjcMVGX5V4bb3ASMnA0oHsiCqxnHWNod7m7Hf4CrfR/aHr9SNM2TZZrcK8myRSZuRCRCeCtv oNBJ3xiJNLClTqmbm1TxRsX74tjLOTlxDdgnD0C3O5C+ykBhdyVWBo+aNN5UpQ2I8HoHhJvL3Xls /TQh4NQnDiapDnpYncjeOMFvI5GhvJHbVIWTCnSe/3Aj8cFHs406qLmhurpD6390Tsnu04b3so5p s5stYAJqx6MMUnIDgwo5nC28gnBxPPNUCpYaoZiYmZZGVFbTQXEp1DHVwOmMpYwjklt02KpybNFK HZDCbREArREafALdHDDNbfV7xJSdOQBK9aZcnZIJxWo4wx+sa1y5pwJnJMJgosF1Ku0xOuNbFzpg POyLmX2EdQeFToFMOytIgcJ6JbyinSaUUUiQTMSaVhiBm+eF12PQVdYK4qgrslLKqZlupiTBVznf 9kDxN/V54pKLlbo69wN4vi4Tan08rETMUCX2V3Qlh05KYTnsi+mbDarNKveo5IsLPj1/IAl/CTFB IBmuzro3LvisEQV89XmAVZWZCD96XEzH3mQNC7TIZY/tqTwQqaW50OKOKmDJFAhKE/9tZ5rZAaQI yu1B25ysI8bdFAJ+XbznTjgyPNnedBLiC1/kX+3vclGCAu1DR1Qjoso8I96IBSr6Hpl/WlNbOyP0 LsGT8+TawSh29gLjG1qKUzPwRMu9y798VyadeZvhjx From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Mar 2022 01:26:42 +0800 X-OQ-MSGID: <20220304172642.94892-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220304172642.94892-1-quinkblack@foxmail.com> References: <20220304172642.94892-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/movenc: sidx earliest_presentation_time is applied after editlist 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: Zhao Zhili 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: Fix #8334 --- libavformat/movenc.c | 7 ++++--- tests/ref/fate/movenc | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..c1b455aba2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4750,9 +4750,10 @@ static int mov_write_sidx_tag(AVIOContext *pb, if (track->entry) { entries = 1; - presentation_time = track->cluster[0].dts + track->cluster[0].cts; - duration = track->end_pts - - (track->cluster[0].dts + track->cluster[0].cts); + presentation_time = track->cluster[0].dts + track->cluster[0].cts - + track->start_dts - track->start_cts; + duration = + track->end_pts - (track->cluster[0].dts + track->cluster[0].cts); starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE; // pts<0 should be cut away using edts diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index 19e4e291b8..968a3d27f2 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 -5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag +69c9025ffb10302c7b5c2ed9fde86c44 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 -5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag-discont +69c9025ffb10302c7b5c2ed9fde86c44 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 -dc695d65e8a0cdafee28acd8a5ccf81a 996 delay-moov-elst-signal-second-frag-discont-largets +471fc64644a6bf4065c489fe4e04be7d 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 - -d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr +5c873f6e37d5af09e3c6329cf94cd6ca 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 - -d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr-noduration +5c873f6e37d5af09e3c6329cf94cd6ca 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.31.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".