From patchwork Fri Dec 24 09:58:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 32901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8014442iog; Fri, 24 Dec 2021 01:58:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiGJo+h0j95zI4XlUCdd9xKiQELXp4uNE4eAcaMtAstTts8IpDgDtrWI0SSBnven+BpRz6 X-Received: by 2002:a17:906:48d:: with SMTP id f13mr4612867eja.178.1640339921314; Fri, 24 Dec 2021 01:58:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640339921; cv=none; d=google.com; s=arc-20160816; b=SUMjZ1sJHuKamHckG7N36eKsv6UVeSHawvwY4iV2Vw3qdAZDf4U+EiJBWxMQdgi26Y muokumXy5jdaL/OsnP3HMTDzf+g3WxEdZJNlgsTFO42FRa79VIhV/BS8SqapKZwxPYe5 Tj+/Egnt9srop0+T5DZWigXXoWu0ySCbz9lTngkH9PKtrQ4JDN4C7Lei+YVw7LQG/fzg od9Yjatglb9HWFdUDpe9U+i7Bd8gtJgGAXfb9lxV0jsxKCBRIIVtbCSgwa+8mhXURPHE vgjuS84nderj5j2pJZUej+ynTvcNyVxYQ7Cf8zpBZn0bgBqRIgM2ZCnPhEH3e+hVO3FR 7u6A== 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=J9DOFeEfEYOubYGRhihyKIxOHhhG4pS+Or4vHGjCXsg=; b=vetqXu07zLlPlRz1/QOJd8pBouFfe2ecKMHeEKUxGSh7iSF7GYzjLw3ln6MepR83zq JrRfnGZadSgKBARRjAIOlRCHakqXLIHFLLfQFG/5S0peBqBO2C+LKKBLYe2ioS4dDUEf C9A72+GJYAivjSQj15hHVJDidE5do30yoVBHIkS8jH2KdPUFyp01hjsToUq27a51bO0r zQZQnR20ZzNgAGVMRGCXBToQcr4on4WuMa6doRAkKqQKMKxTY7CkBXjh32IzNs1kMNPz 3Z26Ez3lnRRxCH4hwC6nil70HSRdph+ujDw+DR22nFon74KrMhBvTTsxBLNxTYDmzfX7 5TNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=c80Xnw0Y; 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 hd13si1742513ejc.164.2021.12.24.01.58.40; Fri, 24 Dec 2021 01:58:41 -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=c80Xnw0Y; 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 669D968B2BD; Fri, 24 Dec 2021 11:58:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DA8068B15F for ; Fri, 24 Dec 2021 11:58:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640339907; bh=8yfplFgGxw/xcKvb4uYIyrZpDEkql5W4Uhqy2DhnEWQ=; h=From:To:Cc:Subject:Date; b=c80Xnw0YbmdiG80CZ1ty+c6TUngvfktVqiu3RDgKomSiKvrNPav+mSaJtZFi2M2IT F13ENwU6nkEGrcLGu7Be2+O1S+TSgYq6a4Srle2Vdjv4L8gFF1sLJL7ynhlPQvr7cc ZoxT2AHaGKJiLj8PWSaDxG7ppjtnjSY/TyvC46bI= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.59]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id E99B5057; Fri, 24 Dec 2021 17:58:25 +0800 X-QQ-mid: xmsmtpt1640339905ty5vywoz3 Message-ID: X-QQ-XMAILINFO: NuUrzLQkNC6XIornOfkJJ2jJqEJWbp+7/ynSdADZ2e+RW7dsZq/qV6h/xUWsSR OOsUxScQMlCGLTPgqZ5tpezXhJGrnr2w5kqC1yxN4bvc0/Lf+AphDpQek9whneaihAoOs1Z+zkwA yZWDQb3aZmk9UveEygVsPx+IeIWcuEq5qCbU42F+W7ohoAzud8O5kKOvQrXXORG141OvlUDve5qa px+qH8XV+8wErJhfkAhI4pNwSlgb2FnKFKFrJ/cgs5boF7+YdB0b/hvWvbVaFCCjRgUnuu+/PaXA +Hdhr3RmPGz+ROvuOQWZje4SbLgZ154BMPvj5pugonF+OxIo+yUUezqw9RbWgyMoumWdVtM8/+6l yoEWhQuctNLBBDT+O9paQOBB9bQvl4t5q+n4id+U6ZIq9WIBSqg2UCCMiXWVyToGZtKe3fCfnhe3 2wWwwUJirzwMfy12s4TV8fVzbXsOWn7YBmXKBghA5kuHgO4uQLhkLgkvGwWDTwFfFNlFCd+qOsgU dRssldH7rBKER/BnmRIxAfIOiKBqgp9L0A52i/XHwyde0vxQWEmLeJzOGmPbN6hqp7mYcZfcZkLG 19w3H67OBPRUEDtqENbZsSVHnNbj5dhWdzyBaL6KRVOvXGb58zeUEeVRjGk3fH2hmc3A0x52tJxd 8NYlHySb+aUjOR3uKkBikZKmHeUzKazoR7PzU5MUv9aNwLeqJEkS41Y1yJ1vPFHf4tkafhsPj5Ml /IS2SddmoT+iQj7NeXAEau4HGCHp1FBYtCq3RS9zghYxkl5ItfXG+1XISlntnGCtdCHeUTIw8r05 ZXu7SkC7ss2yUNa4o30jH/86aQ3zXzz72PfqrSScjuVJdNuSrX8OuA/PEu3b85VRo= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 17:58:21 +0800 X-OQ-MSGID: <20211224095823.58415-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/mov: skip moof and sidx before found moov 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: 9GpRcBWM4T8p --- libavformat/mov.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2aed6e80ef..ea2f010aa0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7366,6 +7366,21 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) break; a.size = FFMIN(a.size, atom.size - total_size); + if (!c->found_moov) { + static uint32_t skip_before_moov[] = { + MKTAG('m', 'o', 'o', 'f'), + MKTAG('s', 'i', 'd', 'x'), + }; + for (size_t i = 0; i < FF_ARRAY_ELEMS(skip_before_moov); i++) { + if (a.type == skip_before_moov[i]) { + av_log(c->fc, AV_LOG_WARNING, "Skip %s atom before moov.\n", + av_fourcc2str(a.type)); + parse = NULL; + goto skip; + } + } + } + for (i = 0; mov_default_parse_table[i].type; i++) if (mov_default_parse_table[i].type == a.type) { parse = mov_default_parse_table[i].parse; @@ -7386,6 +7401,7 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) parse = mov_read_keys; } +skip: if (!parse) { /* skip leaf atoms data */ avio_skip(pb, a.size); } else { From patchwork Fri Dec 24 09:58:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 32903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8014571iog; Fri, 24 Dec 2021 01:58:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvQwkl9i6jtvL+UH0z42xrp/3KvzYkkz2tU/MFrC+iU/US8V0311QLbD+8rMZ3Yf8ZvlKc X-Received: by 2002:a17:906:608:: with SMTP id s8mr5126210ejb.754.1640339939380; Fri, 24 Dec 2021 01:58:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640339939; cv=none; d=google.com; s=arc-20160816; b=UfGZIquS8w9bv7D9wNmbiUY3IVvX9UDKBgjnVikt4QnWqrzJbCQKGtjMIj9sx/qh1i 004zDULJ6jpDtqREy3GHFb+6gsCwTAdbY0zgLFPgviwpyRfSf6STF/wUK+Rd3642hJkm KQaZb85plpaZ22wnwmJUINNP4SeszjjfVplkqKR7fx4MSDCXRZO4If7j8piQKEbUmrIs Zve2JtlplFsjgY+zI1Lqt+6y70cGD0qONIOoZLkVhq+H9HAj87oMvoaiJMZfAY61b5uy 5O7QKVoRhv3iWBmyATSFazpwrQ4tTANg//3QMNbbo7sw/JwC5ZsDm+VigTsAsg33FVRl W2qg== 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=tdJGStOgC+Ldvc88WHzhYukSA8N22Vrh5JBW1IdEKS4=; b=rrUwNnna0DjbjmxeTX/7cLx2XxxT4MkyROhvrmbGDmJjf1ET/slkHsgS5Nx1cHJbhz zTBFOM/xIwsW0qD42YqkokXqm+tWWiVWMXcA7untWzTfn5BRj8puqaceNp8+FSPbfmYf YG4icPG2xn44F7DqDvN7USgTKQOS3CjEwj86mzxRjEVyYlwl54TZKrTrEF617FKwHQR/ 2xiaP5yb8r9kE8fgjpWq/G9Q5S4l4nY9JMdIzgd+id2Ldn1CF1R91hhdzQTuQFM39Hwv AhE6Jhe+PmVb+ngK0Wpn/BW37E1aF7SrXpWu8EYuhgRRzQIz8PN3X6EYuENaOxIYN66P DS4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=nXNFYARa; 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 o13si3600119ejy.678.2021.12.24.01.58.59; Fri, 24 Dec 2021 01:58:59 -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=nXNFYARa; 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 36B2268B2CC; Fri, 24 Dec 2021 11:58:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-209.mail.qq.com (out203-205-221-209.mail.qq.com [203.205.221.209]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FEE568B15F for ; Fri, 24 Dec 2021 11:58:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640339908; bh=dpNBRa0OnDQOyTBwZE7e7bOpcw+6MIn98KAymo3ddwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nXNFYARa12dO+8iQ5mJIuR1BahRMhgyVFViWd51FCsGGQBNv6RjGYbyWrtlYLvN4t qO/2lvESEp3HL63bGNrEpdeuR3UU0dc2BHQDIdVFJT2O/OWGtJqdeQPzM9KfwkxXeF NIWuI1pO6YfxILu7QU0UFis0/Flz/LbkdrB60TeE= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.59]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id E99B5057; Fri, 24 Dec 2021 17:58:25 +0800 X-QQ-mid: xmsmtpt1640339907tu9jnf2ga Message-ID: X-QQ-XMAILINFO: M5aCtjAndv5O5pSk+YyKvki7h+YelDQ+QSPIZRKT40yMLFNDhDxrKxsTGnaW33 T77x8+ScXKi30BYUSAxk61NlnkXvTmbsFdvy/F4cAKnM6kGIpuiXjVxFg8a7vtxJYx9nT2fIC6Xr MsTBwg8IQh82QsjVW0e/Iq6gm3sXs7aEnk4QKaTRy58E7YIBhrxsWoJthBBVxhN/YbvXVi+sUM1j 0uOVhTzc3Ncmo3gKOzIMlm2RulceU3MOcEd7QKIFvCLd5sLnfkYROHiOxCWXfO8MCwqjm9BuZwKw 8lEHjOv30ewXmEthY38IrAEbT3Q4mUT8Ph8o7DJee0xuXzpztjjupaC4hDhdjMiF3lO5owJ1QiQk Nqh4fY0ZbOEM2JCXYZ4A7YJ8ixsoqh7NM4hqi/4MpXvVZfiXX4kJTvTDJQxfxgAkufGEwkSoCcIf cQjverHlGcYwM25dyRy7TGK/B/KeWXTLqXc9C4KKLwKqv6ql4UAW+BMfccwsawBBZ99V9+UfD/Rq K6jDNoYCAIYbiAllCijrF78vxqWednhmfMwfjZ3xUkU/7HTVoanGQgsLP6qhTNK/U8FF1DzUOFl1 oGlVI2CXHSjOPNk5KO2g5uyyvyZaJOEBgvmByz9dWtrUg+rN6JzNxuWCgGMq1//K0lbYnTM1fG3M qEKxl/fwyaferBf5GNAs9pxEPtKVqtjCCw5JXuErjS/yH8dUYrG9gj83UVkVa3+/I1mSgUobqg7a I25ebVtInuotW7V8XeMU7wpltvCK0wCbOrBmn+7bcw+dH0QYq0mNPu9R2CF0EZf1esVt7wmWbeNV o93fWB0uagDtFeCywyl9NGCdVLzzzTAgepN2U/TdmdYvkSqxHD7IJEYWGJynKk2Js1ewMucpN6KQ == From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 17:58:22 +0800 X-OQ-MSGID: <20211224095823.58415-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211224095823.58415-1-quinkblack@foxmail.com> References: <20211224095823.58415-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: skip hoov box if strict >= normal 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: 7Pi/EWXcXFjW The samples I have got have hoov and moov both. Unknown boxes should be skipped according to the spec. So don't treat hoov as moov in normal mode. For backward compatible, a log message has been added to notice the user to relax the striction if moov doesn't exist. Fix #8883. --- libavformat/mov.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ea2f010aa0..63483740a0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7324,10 +7324,11 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (atom.size >= 8) { a.size = avio_rb32(pb); a.type = avio_rl32(pb); - if (((a.type == MKTAG('f','r','e','e') && c->moov_retry) || - a.type == MKTAG('h','o','o','v')) && - a.size >= 8 && - c->fc->strict_std_compliance < FF_COMPLIANCE_STRICT) { + if (((a.type == MKTAG('f','r','e','e') && c->moov_retry && + c->fc->strict_std_compliance < FF_COMPLIANCE_STRICT) || + (a.type == MKTAG('h','o','o','v') && + c->fc->strict_std_compliance < FF_COMPLIANCE_NORMAL)) && + a.size >= 8) { uint32_t type; avio_skip(pb, 4); type = avio_rl32(pb); @@ -7340,6 +7341,10 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) a.type = MKTAG('m','o','o','v'); } } + if (a.type == MKTAG('h','o','o','v') && + c->fc->strict_std_compliance >= FF_COMPLIANCE_NORMAL) + av_log(c->fc, AV_LOG_INFO, + "Skip hoov atom, try decrease -strict if moov doesn't exist.\n"); if (atom.type != MKTAG('r','o','o','t') && atom.type != MKTAG('m','o','o','v')) { if (a.type == MKTAG('t','r','a','k') || From patchwork Fri Dec 24 09:58:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 32902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8014515iog; Fri, 24 Dec 2021 01:58:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxSXO3OxdJ5cCiSMPmdMbNBqQKyxVfwBiDQPf/PYvUqNcZ9Oq/xBXCSV7ZkwbvoyongWI4 X-Received: by 2002:a05:6402:1a49:: with SMTP id bf9mr5182805edb.18.1640339929916; Fri, 24 Dec 2021 01:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640339929; cv=none; d=google.com; s=arc-20160816; b=B2tZ7hKTencVkk+WF8S9bqe0LCvmcJOo0kQXrzo+dhmnN7+saMeGkr6WAlbAs0WArq 6dmJhPd2Mm0rzmEXgEWYtigajaPTbCv0WRzccS/TbpKFHHKHZiQsPcIL7EF+rNCfwSuf sGcAvvxIu6yJxdikXap32+HSHnqIXRUnwQaNkzTC/mHcmzVULvmFmpJrPIux9yZmA/Z5 s+TP7QFQasyHSBlRTSOOnCwSe0M/6ncinIdSfqnFJbznCKyltzmH9s6+WDp0tHjm5c+X U8FIeVHuIqeNKmao+27VLRSwg0UFMYX70qPUN5hXnK3YSJU3Elq3y5ZMhKqu7PMEHoYm /cfQ== 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=MtwihmY9GYTe/+xEa/hcxzfIdQ/skjhjqTyAFwIsabs=; b=cVn5gia/vzFf02/VQouJB3imjwZgFpB9iPrXSotaNDyyeEQnY5cibqWMhnqvF9PgIq t0LG79guDEo6ezW+voUYuLMdVc3D1i3T1sVQbJLdT80efyAMNFK5fRtOSGoTxreufdUw cpGB/LKQ6b9DVtpS4N6123+inEl6045rI0NWma1ATyliz5IHwI+25ED7kGuGf7ig+FLB VOpZ0Rn8CbQXZgsmcx76rMazc6pjGQgbhSz9qMDTZyjBoCotL4AT740qvgfAjzPdjoAf eMhKm54M7m9hc2SHBMT7DFGCDu+72tRXsi3jUSNMYyKlYIh3YjrN8HJZHZiXnOY8+PUf 4o0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Z79hVBfR; 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 r24si3142793ejy.582.2021.12.24.01.58.49; Fri, 24 Dec 2021 01:58:49 -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=Z79hVBfR; 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 6622068B2C6; Fri, 24 Dec 2021 11:58:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AE6068B2A5 for ; Fri, 24 Dec 2021 11:58:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1640339908; bh=dE+kjAZMDrw4wBxfdCnzhU4C0BQlEBSDYK9hQ18q2pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z79hVBfRWiNuV9EQFrawA/xYGMI6NKvX89KsY7iSo3WDHZCxTFJn9M7UYYI4Fer2e 5L6sPqsS0dwaFuH4BQYG9UZElkgBdgsWaEhaLO2+ATDSkPUN1l+6Oz7LLDGzQjQXf5 KGfZljeM9YLK0CSAbHkBTCMIn7dfwKPRp9A3NuKI= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.59]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id E99B5057; Fri, 24 Dec 2021 17:58:25 +0800 X-QQ-mid: xmsmtpt1640339907tknvn3z2v Message-ID: X-QQ-XMAILINFO: NojR6Ao/DkEDJEUxk6NIzDL018xeXbJhlQ385qv6DAF2HNhx2BLAAqHz2BBdJu hiWIrECawrO2nW+z1sraV/pV4fob5VA2w/9UYQAMDoPSe1udWERu4MQjWPEtF+EXUP2TZgGMzeWT bieRNxelRF9/HT4QWrmUfRKUTFCx/RS1kiy0kLT5usO8cfVEf3KCJYqinQiikLjawhNjPEHfc2bT 14dRElUEDl6NZLN0xlXDXIX1NAl24/RXqz1GWKEuTuJ4Z7LWhwQ3ANKhR3XU/Y9j/BeZa77VNPuy GM7gYI1L1T/x+gWC7Nb49RRxZA0f6n9UU3dghA7s/nnfpx25ycANWVwLPPC1pGSj1eFclwBheX9f FLfZVKNc1Jdygd2ttJD6oqiOkdBymZordUvCzhPgcatDvg7Z6J4Q/Dbr1y5Zao1b7lXsrqcr24GQ onYdXNa4P+Fkoc+U6WBHNBjcE8/QkhB/wmP5Ulsvy50RwMPHc65qx2lowyGQAVzOM5eBGYCGZ3h0 Ka5bKYh6lonlrU5GxDg8cyPUKu64v3KM8lDUl4hqyF5KlmnTEBsyMDIuoC4uKlSCpVlkhZs+6LIQ bS0q+cjXh2GxArFQ6yizn7TbVVN3MktUDVbvivWk6hy/dcqsDrR/P9z5wGgJwcyPgB51GWazdYEU rJWzI6v08XG4mb/tN4WM6OofuzJNM3q2zpyfivlaMuQKwCi31RL4MEnSKCtHIrBjkKh39Pf7LdXz zEeUij8lm6Aqwb6wfep+vbUPvdlZMeDMF3znclf9B2t/zqC7ePnkDZfugkTupJbXba1fKgPxH3Rl bh3n4MuPgXRPPozK1jUtqdWuGHpbJPLTrfKZFGfdrImnolqMJ8/bas8+14n1d24IFFIW4LuURiSL ALu7YBDmAGvXCeue4BWK2WGBvYijPE40E2fPRsFlX2 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 17:58:23 +0800 X-OQ-MSGID: <20211224095823.58415-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211224095823.58415-1-quinkblack@foxmail.com> References: <20211224095823.58415-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: remove always false condtion 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: HY2s7AH7jSLY 203b0e35 made duration unsigned. --- libavformat/mov.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 63483740a0..636cfce400 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3972,17 +3972,6 @@ static void mov_build_index(MOVContext *mov, AVStream *st) current_offset += sample_size; stream_size += sample_size; - - /* A negative sample duration is invalid based on the spec, - * but some samples need it to correct the DTS. */ - if (sc->stts_data[stts_index].duration < 0) { - av_log(mov->fc, AV_LOG_WARNING, - "Invalid SampleDelta %d in STTS, at %d st:%d\n", - sc->stts_data[stts_index].duration, stts_index, - st->index); - dts_correction += sc->stts_data[stts_index].duration - 1; - sc->stts_data[stts_index].duration = 1; - } current_dts += sc->stts_data[stts_index].duration; if (!dts_correction || current_dts + dts_correction > last_dts) { current_dts += dts_correction;