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 D04E140A0A for ; Fri, 4 Mar 2022 17:33:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C11D868B18A; Fri, 4 Mar 2022 19:33:46 +0200 (EET) Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2835968B03D for ; Fri, 4 Mar 2022 19:33:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1646415217; bh=Q0oLVNMrDj3tuP8wCnlhXCcYtNwzcKFamD0oBHdVhiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pJh4XmWMSH0u0iK+RpNupFdbjflHTRHJ+WlFQq9HT+Hr2OwqgQgennOoJHlvKcoa+ kq3FSvr/0BDo0bP6vb2xGL2OcrhxBof1U2m/Juqn67InhOqUb/j7197qGNGcwocbm8 +BJT/Y2FJVoORF/Fk2JWC1R8qVsyS+MVfHaZZHaw= Received: from ZHILIZHAO-MB2.tencent.com ([119.123.75.91]) by newxmesmtplogicsvrszc11.qq.com (NewEsmtp) with SMTP id 86315CD9; Sat, 05 Mar 2022 01:33:35 +0800 X-QQ-mid: xmsmtpt1646415215t14mwguy7 Message-ID: X-QQ-XMAILINFO: MmPNY57tR1XnL2kFGqiBh0NF4XWVj8TQiqBAlJ4+k5MXEYYtfZL26L43z8dbZU vZCNji8UG6XPSZJEM0u+DivaSu89fbZU8Ywp2vVVd9k7m78RlnQ3FniuGEsFWXKnGE2P3vR07udN XiIaIGR8DUlhkGAulrBAqaeLpxeJWHaXwvPjUukx+wJlWK69XHCbjus8wITTFYSGAo2pauEffoVj IQ4Ol/otX1vjTV+/DIQ9ruQlAYJrcOpGGfNYBziLtdZCSirrvrvTb8XKlg3DvFrnxrhUjOEX/GXW 7Ndwl0KY3dknuLtkbOfKRr5j+xNShCSjDoLAL6GmEwiPIBN0nKP7JaB/vdA/d+i/OviEiA7enRJv 8jcYF+0ZPyuy3kYE5iZTY16dzgkNye034iG4dkJ4Kima5KnzLMMmC7nU9zbXdh2z0++tLGxAs6gH qcQwmF4p1rQqQvdIFbspT7obS3iGdTJNEmLZ49s6zz/b2q0X2smwOO+GmJiENwWqkvHGECYzdGDp 4ejm7hSICun2W84Cv9FSeR70Oq++VI1Z5u+t5ZfWPbWmPHK27+dn0/Tm34zJyVDnaYU8rnwveAcT UDYGSWYJkF2OFrfDxRmDx74b/ypgi5XXNGXyEyYjHEcG8dohlGY6OZDrK+nuKNBhC+/k+FXQ3QhY 11SQcoqqQqDXxtZtWUGkDM1t9EW14P362C8y6G2yJE12ZcMBqYInoalVBnbKydOa0Z19RMgy9q65 isdKWLvp0R7vFx0eY6hVdH9bNpyXDDfIY9mhgfYwaTWmIvKt46tGyJ/4kKkevdiAFRg8cLQsCE4l xgk5amvzSTO2BAAXJNA8f9YHVMmxt5tfD9lPxxLK62YzCGo/vNt/HQWg5PMUAu+zpkfaFyNVcBUi Omwe7N2E0XGkrXaCD82mUAcGgQu1g/3U9f6I3BYgkQvZ/4westHike8YGDUr5l3dB87+0ex2NK From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Mar 2022 01:33:34 +0800 X-OQ-MSGID: <20220304173334.30237-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 --- Remove casual change due to clang-format plugin. libavformat/movenc.c | 3 ++- tests/ref/fate/movenc | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 4c868919ae..a2da80bc00 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4750,7 +4750,8 @@ static int mov_write_sidx_tag(AVIOContext *pb, if (track->entry) { entries = 1; - presentation_time = 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; 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".