From patchwork Tue Mar 29 04:50:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp794006pzb; Mon, 28 Mar 2022 21:51:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgcIre8FFOrFsoS1MqARJJLogW3lRGktlmu2GwT1p/6IlEx43jes+/4CrqQQFwz8I3icm1 X-Received: by 2002:a17:906:7307:b0:6da:92e1:9c83 with SMTP id di7-20020a170906730700b006da92e19c83mr32321713ejc.459.1648529486782; Mon, 28 Mar 2022 21:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648529486; cv=none; d=google.com; s=arc-20160816; b=tEOCZsEnDozN7yQ4+xNzRwHoQ+fWSEEuBdFTIwYFviA+CVCfJPhzlFwKmTkamuDtxB op7HVUVIXOAF/6mIp+Tlp9UU3uxahlLO4fYaTYvP7rljWATCIYGzBzXc/yUTRhRvuLQE aZbOVDPurSPk9d0ciJ5HwB6hyoVrjFdnPeexc6BXLQmuMq+DO5b//vKxjDXqCfCmDW2g SfgY8UoHYm3/O6Ig/8PZn8mQOtoAg5OjMtTs7WzBRyYlrh/qs52Qa7d5z8kO59ADB9z9 jOIy+t/FYqZCifatqQNMP36FKaixKwjMgNr6Ueyk1p6Nx8FLsQn4GB9aZuIL6sgekSBz 9vLA== 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=VcE0k58FP0Nvad6Pyi7BQ9k7eI2DYMSG9KuVrfinsPE=; b=RlDTfef5XhLSsl70TBzIdSI/JxDORt+QwEMI6sMJRYN+gIverKujgHXSEkHc4rIS8Y 9koAMAtqYaQ2YAdqjjYLnECy2N2pgqcr8XtpBOgZJV4i/1KQK8WSRQ6qSSR6iRQfzbW8 uYO8RZmb1Cc1pJuxzKNvXVij4QbC0sqlDIORt1+GLG3v8tBawy6S0F6xNH+J8AbFj+CR scE39+Wo6U4HzPxEDEbV+ya6oIBR6L0Vfk/DN+vKSbg/heX5zNDXyVLrAL14JfYYaFFL tJyGf0L6z6MceXQTLnreoGo2w9Q6ZSAwByXx1ns6+z4Lj7D0Zbcpr6hWBMS6sDYyRrh+ lszQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fctVQA8N; 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 l21-20020a170906645500b006df76385d8asi15504198ejn.554.2022.03.28.21.51.12; Mon, 28 Mar 2022 21:51:26 -0700 (PDT) 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=fctVQA8N; 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 A359368B256; Tue, 29 Mar 2022 07:51:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66A8D68AEFE for ; Tue, 29 Mar 2022 07:50:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1648529454; bh=gGOGpMuwO8pIqCkKAochbjQb2JaQCtxCWA6VgHc2+fY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fctVQA8NHXJQBBFWz/agzAJ/xhCEFz2hC+2zs62QavCGSOpUEaRqJQs9Kj8K9LX1/ rXM1MP+pZQ2pEVpQWSmqceDUGth7962hyFIKy0ASiE/4xhX1RxeJp18F4VKcQBRDSm F8R7R1dLPdU8juzJeXGFIvdC7IWWeMRS25+Ffyxs= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.72]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id CB41D447; Tue, 29 Mar 2022 12:50:52 +0800 X-QQ-mid: xmsmtpt1648529452tn7sxs2ez Message-ID: X-QQ-XMAILINFO: NhpLzBn2I3Xw1c0m1thf46nFa0mtHH85LPfGkrD/YxTLs1LnF77zSOGmaSljsz R/ZjmMqx+b830RCe5/Yii/+2VdgOSHBJvhv7XRaEFT3x5FyMViSLl8//QNY/r1xAo4+kPhklNY8H OxjPS4+DdMiCdFSW98tb5mhbN6MwVUYrJQHlzROcV80FkCj0heMewQ+tQPoi1qxD+hxSrEjrbM99 rr/jaeZIZ2iNyd6bzNMIOeartxHomlxtawjyW7I3xtv8r6xG/b1n9Oa6mlOJhjHi6YNs/4j/2QMI 0YetLtWoiJ45exAvuUL9AojH7Okge11eofg+7ik1zacIGMrglxmsyjDWgSRVBUyDexON7WvRo0o2 uy5C1rQLonw89bh9hd5LryvOH9lQ5OqrFDjTDcabw0RtZqYsd1wCesauT7UdrjN3vgdVrWarJ+Bo AYiuZiFJntrJlBfbbtrIyLdLCXpaQ498p6IEkS7L6NBTPiK69dYrWm/o0Z3QNKZjIupa0a/ym5Xg RqpiyNvaz2YIjtTChrnDkBzpp8WprEGdrkdXnKITmXslAIHRAXRETogc6jQfrIWTuvutYYMxZN2l OBrnvMPyRudajxRGtj6rrfgxytQjOxsIlLKrJL+Ew0jSO7LqY4eu13hWH9JMBirh+77TpAAebHW5 c9M9nBNPmA2EfIJO9j2oMHqBsjQgUSgiDL7SCyau0AzsdCzW2t566XerYtSTiypBLWxuossuJcyF 4X9A3qx3upukJ7awgRn1dNZAHNV4fiQnpBf7enOO86C4YZWHEFJpf2yN/NPOZp24Tt10Nel84QiF dM9b9YHh0i+5IFmyBlXZEYhkdv90VGt2+xdobIrObIsZJl5bbvbJp6ts1d6BTzDpOVEdB5VcZ6PG bRsSueghvuCzFJ7srT/O04l3YbXZpAa0uGwzJwQjx24dC1VeIMTDQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 Mar 2022 12:50:52 +0800 X-OQ-MSGID: <20220329045053.35358-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: T9iYXDrhr3XP --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6c847de164..54a92e3486 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5023,7 +5023,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:33:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 34613 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1827854nkx; Fri, 4 Mar 2022 09:33:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQWSalgrHxAhFl9MeJigzjp3Ll8cD77xpVaKOwfbBd2CiXojkrSw3tmrJPoyA+RWf3lYDy X-Received: by 2002:a05:6402:1e8b:b0:3da:58e6:9a09 with SMTP id f11-20020a0564021e8b00b003da58e69a09mr39736364edf.155.1646415231041; Fri, 04 Mar 2022 09:33:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646415231; cv=none; d=google.com; s=arc-20160816; b=jWY75J/aN9kgRhjamCrJwo0LUhb4YZY+uJJyBsF28cJfhxgEPy/6+P6/drDujdnaTQ qpQeNAdbEUOJaEVO2b/aHYEWjU0QMfljzPqJBkf+eU2qlx5P7Sfz9ikRL2EIw3qJJeHw f3V9OKgXz4rbf7En7mZetRFEpAJWo6xcbKZdIFf2ZYNwqmOshgl+Aj3x7EochsI0pdlQ V6e+ttKCT8pEjQ1QV1VoHNiZbvPfL2w638sEFjrLYtb0V22jQFD+eEUxfLy536fXx2bZ rU8ZaSOEBMgjoRf7HEvOtyuQOQqhaIsKQ+5dm0gZInpH2TL3CCXZt6JsG7RKrg/HDt6p ujzg== 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=Dk4Lt8PLp168aS7FP/zlg4ppZ7bq2xUJmi66pGsA8B8=; b=gp8YKRjm3rHYjw9+lUuFehKIYrG4x2ptwLqaSFpQmOKj9TJYVHNY5ggDOfwZJT6jYm Tq4dOabtRw/nSupLwiAn1r5gYTzHQAP4eMDiBI2JQl9Xaq+RJqz0XSqSMLwW0MWX9LQj IENtJKfAbrfKp9yCzG8MZI6vHIfqitlB41lEuTuRULgItXK4BdHjNQTT5GiNz32264n3 gLnx8zQKOA03K8m63mq1HEvXRCp4pOXTGZUrzb3L6bG504agc3eRWoM95z+9ycIJhw5O q8hp91mVN4DIV7rFF6GX7kJqUe5YhrrAlxEio9gV4SBCHSy8hWNAAoQAqHTY1TgXgbNj kl5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=pJh4XmWM; 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 mj4-20020a170906af8400b006cfe5c91e1asi3373999ejb.110.2022.03.04.09.33.49; Fri, 04 Mar 2022 09:33:51 -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=pJh4XmWM; 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 07B1568B19F; Fri, 4 Mar 2022 19:33:47 +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 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dsEP19VUbCCR 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 -