From patchwork Fri Mar 4 17:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1821558nkx; Fri, 4 Mar 2022 09:27:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdg09ftlyvYhSlW3ZvLD62qZ4aSdvkEvfKeYnopmshLuM4KRPy+fzS0d5cYcs8CTZOwJt5 X-Received: by 2002:aa7:cc02:0:b0:411:487e:36fe with SMTP id q2-20020aa7cc02000000b00411487e36femr40347315edt.338.1646414847823; Fri, 04 Mar 2022 09:27:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646414847; cv=none; d=google.com; s=arc-20160816; b=yovjSQNgg/1Es46xncm3JrqW8bkjCUzuRQded7ziWGoPAU1F/aba8CVRS/CplQ/iFW O0+jOMI/L3Z7aAV8CaHwFlfdLEI2MBj6mSz3bkKA3QWrbQupuwtshyaI7fR4xjgojl06 uSIhsnHTEImTF9vDnBAcQgQ3B/07o57DWbD0u3gOaXRiVJIZ3QuRXX0skjFlrXP4GKKQ GJP0+Y+A/aVaEysZewOk3kpo+KxntJmKNaKktBhQurr6d3yVZXxnr8XrBQpdMT1QEdXy AZFiKZnKvdFcOD8RVmGJ/+fskPlUMsm+N9BvLz9+L11/t9g3/ItNUuY9aY8G8+Gp9pdk A5pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=sk/NDdrkHILtY2Eb7UYCgFHbuNrGul+Vh8Sez8VNS8U=; b=J5sQGSUgctVSgDKjxQTwq41GFepF51pbdtwasqKy2lBbGxxsfd1UowKvjpkYW0uutY uLaI5kaWNIfobJ5MUyfct+8AP2FCnEeRi6vrvrP+KaYWZULKTMSrj/lXEmICcyzVbAZH AopaHYTy16TMCUDVjmy7Yu9PnuseXmp9TCnsrzK2SF+66+AUCPeILRffqqbXAaGwZP7j MpxJvguV8q+RIKvGl/NA5Mx3OtJJ7bXLd/YJPWJRaTn2AZ84N4WRR9R5sNwX/o0aBzUN a5aCb+rEm1vnMIvIEbjhaYorvlM+ZdjZCF0tVYOzLprpLXY0KIcXB6+J67EQR8YcdlFR ZB6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=IfgO2Z6V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jr6-20020a170906a98600b006cf654147f9si3225496ejb.96.2022.03.04.09.27.05; Fri, 04 Mar 2022 09:27:27 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=IfgO2Z6V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 287C568AED8; Fri, 4 Mar 2022 19:27:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 D651A68AED8 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=1646414806; bh=BMF/SdcNazbnpYM67RiXWPIok8gBzBFqj9VNftp4d8M=; h=From:To:Cc:Subject:Date; b=IfgO2Z6VkZZkJsfz2F/RJMkKyejsj+MG/tbWIyPuMOadY9mj6fBHR5zLv/195MnYF Pw1sSr8BvN+Odmig75hZ0rWywmxm26TM1+YheDC2OynAJCJZdB6u2dxPbpuyAS1set EX1EBluX9VqwPQiu3mecXdNQRhMJbFn3B18EkRuc= 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: xmsmtpt1646414804t031gxfkg Message-ID: X-QQ-XMAILINFO: NBOcPERDMH3A+P8/++JOkUUk4NtKcZwztP6KekHBQ3V6sYL9ibTbW53Pts/rQJ 5jTRx1PJ6JqcvFxDy2cpCvuIOXEegBkW44PdP3fdxcjaaKQl1Yv1KaBapyEujd4326kLzrmuf6T4 Fh1UXkTNl1smFW8Jz01yf0arDNJJZ+XFffuTKdNj9u9txphOum3AlGe0nRkJgaEzc+oFfd36XFK2 s0CfRjUx9l9D9sjlCFtDtOV0jiom+Peogj7Bhw3L47OwiFO0ceetAg3JqbAUdoxNIYkvZ8QzsbAk k364wSf2XCQXZcDgKj3DrFuvr6H8IVSNXMQbC+g/uvsIvWsClWMKFK8BlRUs0MyKRHEY73NTt2pI tE4tIqASG2/a8mjLmfN9/yfLF0lKIqfRdOAg13f6kxrgozls3AfF3HD+2ANQ8Cm66NXj4ZsuqEvJ +o6LgMnw+Bg2OZRMDtuOAc4qPMUuwRRexZieCeDn9uylAe/zfsCbcKFwLeDEuIco3C2nVEKarcLV 6/qHSC9Q5RGLcV4mZGI4tVqG2ndswggYy1+6pgpz8SBgsUX3B1JDxqfFUyE6RK3aU3ClFSbmxVWj Hjb+Trnga7aEg+a94MHue5/O48OVZEOtxUjxZGlPbY5neDvdIvPINcx0dI9TKq64u4fWkBnh/eMU v8Kzsfgy8buXgsdUCn3llBpX1PHtht/J3JPntpG56aGzYM4V6YTAginBcJvoCnZarsHaD7E6I2WF lUj9p9wxGw7938SoqEtXHPCqjguRtHWDV7SNSUWKnincTiZEe7W/C7xPtTeFnQTR0a9QhC+vmm45 AsXjF/3b2zQNRwB1IZC1yqsdkK9phPbPDm5F0cqQ8N0Szvld9n7GV2pXatO7gZA6o3Xzet5e38qR Nduqv3B8bBPNaYegTTWZ1XEtSFCpzDxQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Mar 2022 01:26:41 +0800 X-OQ-MSGID: <20220304172642.94892-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: log the right variable 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U5B41VHjg9ft --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5e26267810..52caa6a891 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4863,7 +4863,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) // pts = frag_stream_info->sidx_pts; dts = frag_stream_info->sidx_pts - sc->time_offset; av_log(c->fc, AV_LOG_DEBUG, "found sidx time %"PRId64 - ", using it for pts\n", pts); + ", using it for dts\n", frag_stream_info->sidx_pts); } else { dts = sc->track_end - sc->time_offset; av_log(c->fc, AV_LOG_DEBUG, "found track end time %"PRId64 From patchwork Fri Mar 4 17:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1821445nkx; Fri, 4 Mar 2022 09:27:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbxi3WsLxniYbmN7EAaainIRly4Fzr7iRkiVswqLJnQO/c295ICisWWTSUKzmSKDnk/ido X-Received: by 2002:a50:e081:0:b0:401:8823:c9a8 with SMTP id f1-20020a50e081000000b004018823c9a8mr40404506edl.401.1646414840078; Fri, 04 Mar 2022 09:27:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646414840; cv=none; d=google.com; s=arc-20160816; b=UPH2kTNrY16Yo2p0MWgl1lxKMCH/dynLITPSketZuYQtngzH3W/4CT2TdvCzXQx7Yc W7NY2NNiRCNNcFZ+fo+c9z6BciZpQaQEYDxlR5GZgz/J9Jz5AYbquBBiYu0IdyoB3hDF iBdZ1GZQO5epkSKPPAgm8NI4ftla+lTorYtO6FAYC06a6MnfBLZw+2XvAAh44IFjAq2z QW4qd6cRiG24xq1lM06juT5of7ShxFrzfRNlZkTM4ZXGvagRFuHalQTU3ZjdC3zl9sMR XqiXvSMOTsPlUZMxOR/dlelyzLpPsFOo1WvRDzDWGZzzuwFiBundMWzRdIC0EBtCOrXT uoUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=8mxdyIzFl/4PhofxSeyJL691eH6GGJ1zu2rIE/EVfYU=; b=yZQOUmw1R92iImEANJbYoXDkga4MXY9L0JzG5bPfROltTTS6uu+IvZbU3Op7dK6hE5 joI5H9gPuMb99x7eTsmDEdK5FM+kSp6dRurKCWpp3D4hCsaIBp0UWAg+Ustwe129RKNG E2ify96pvClBqDG9zBLdA+FwfVY0IS8JoC/ocdb2nobyX74vJ47LhOnzu1xKh67qt7T0 kGgOxtQafv/bwc6aeviwQ089h1pQZ6e8G64ypP+zYpu/9Hawj1+35nGj+Nne6RTuFIQT N4fUYTorSqSq2Qbho4YGxP+50TPRe84UEpx5uFM+Qfr4rhefQZSbq8iIKiM57MmHoR3A 9Lgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XyePihaI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i10-20020a50cfca000000b00411348bd616si3453967edk.595.2022.03.04.09.27.19; Fri, 04 Mar 2022 09:27:20 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XyePihaI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3644468B143; Fri, 4 Mar 2022 19:27:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rzINeEHBWdAn 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 -