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 B9E894231A for ; Fri, 17 Dec 2021 13:51:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC1B768AE77; Fri, 17 Dec 2021 15:51:06 +0200 (EET) Received: from out203-205-221-242.mail.qq.com (out203-205-221-242.mail.qq.com [203.205.221.242]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D02468ABAC for ; Fri, 17 Dec 2021 15:50:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1639749054; bh=aNLtN4dw0FQhCXPFb3EtsX/aVGZQa16FFJH5eTtyypI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oO88ceOt0XZ1BwM6/jp5/SFtvAKT6gpd0EJsoENNRqHur7g4HNKOdXnB87h/stl5w uIm74/juLRLVS0dv6pFi3BcrX7SVfNxvTx1WZJBTNqhpBUzIwc47YglHtRh83JuxXb MSuFFITdOV+aMCZR4BrDmcjYqrjumclyUVJnaZu8= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.58]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id CB50983C; Fri, 17 Dec 2021 21:50:53 +0800 X-QQ-mid: xmsmtpt1639749053t5h1guyfe Message-ID: X-QQ-XMAILINFO: M/4LTY5cYFBC84R+RsM/a+ZyY4coFnqtr7hjHlVNcSId1E+rBZ8lklvUjxl/jZ KEi5TQNpMm5mc5FBGFZw007vBIvsrUh45rkiSFJ0MFf5MXrlLzx86p3tkdEPEVTfykdxZkJke16g W/5UVOJz+mn+k9KbbW5H0dDE4PmidatK7qjaqAni/yUdJEb4H6IjxesEsMiLtlK6sEvRurNEDDT7 KtG0ulILvbNd9hmaC0qEBvIpNfg3WTzECnBiqebkU1NcTya67bTP2lZ7Lv90n54UGhgZPxBhavMu DNsuuBx4PhdDxqHgiaYAt3GIryWenN4GERnBa1/UdVsZC+X7Clueh/0Fvo+pTFrswhUJcFTcFK5F 9fKONj3U2a1Y5Hd0VdmXe65mwKh4eD1A9Y0Vfs9JcGH45Hx9Zg30aI/9PVHSpEB5SOvzLee+e118 LD1WbUQOLUeYtsz8CTx5/aOShwGdPy7n0/uS5O93Jn5B95cVomwtORPRc6CetUFUK7gFaJYFCH06 Pb4wCrY5CM3Sf558Y+2eZclVxrcMoPtprqo7Rlgq90dgEP2IsG/C27QA7VvSA61gDNmRds4moAvK FQkDX217zDmT4+sYH0GX5UAbX85/kNKJvO14IXLzWKJfom/qTiCprNMMRcg3kwGf3RrrFZXgJfPa 8IHdvTBXk6NAHJmUrFtdC/p0ZtHjf7htkaGjYjxgDQpjRQjxThTd1vLAaBupZu+DcESR8GCN6ybT CJhH2xcNvh8Dy6XXGS/eW9CSqHCBUA7Aw/hJjsHtkDUfYTWwzgOiWZdpfb3mF5djlAJ8Jj2a+bvo /KpD/nJFX47bY4csHT2av1NEpLjvmyetm8/Dnwn9NppKVTCFgJyPhyU1FhT/we+1c9kA9jwdsrmk Yy7yGKxchRS/+IdSAAQWsS+kRExgx1n5I33qghmAWL From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Dec 2021 21:50:57 +0800 X-OQ-MSGID: <20211217135057.51325-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] avformat/movenc: fix duration in mdhd box 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: It's the duration of this media, should not take account of editlist. --- libavformat/movenc.c | 2 +- tests/ref/fate/movenc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0f912dd012..f76ef430cf 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2970,7 +2970,7 @@ static int64_t calc_pts_duration(MOVMuxContext *mov, MOVTrack *track) static int mov_write_mdhd_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track) { - int64_t duration = calc_pts_duration(mov, track); + int64_t duration = calc_samples_pts_duration(mov, track); int version = duration < INT32_MAX ? 0 : 1; if (track->mode == MODE_ISM) diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index 81ea75f372..19e4e291b8 100644 --- a/tests/ref/fate/movenc +++ b/tests/ref/fate/movenc @@ -7,7 +7,7 @@ write_data len 36, time nopts, type header atom ftyp write_data len 2761, time nopts, type header atom - write_data len 908, time 966667, type sync atom moof write_data len 110, time nopts, type trailer atom - -caf0876986b5f033efc0958c338289cc 3815 non-empty-moov-elst +9d260d424e9de4626163fd25ccce5bab 3815 non-empty-moov-elst write_data len 36, time nopts, type header atom ftyp write_data len 2669, time nopts, type header atom - write_data len 908, time 1000000, type sync atom moof -- 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".