From patchwork Tue Apr 26 08:20:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35442 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp2291177pzh; Tue, 26 Apr 2022 01:21:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdb1hdc0QPLCkbh3BtbYecxr4XploCkIA39NIJX9ghKiWUfWfFGaGvG29ochSDllluETC9 X-Received: by 2002:a50:e70f:0:b0:425:da3c:4731 with SMTP id a15-20020a50e70f000000b00425da3c4731mr12749604edn.223.1650961264023; Tue, 26 Apr 2022 01:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650961264; cv=none; d=google.com; s=arc-20160816; b=r2/pnrpnKXh0fPtvxiaMH7CE/obNCyl/3qFl7/JfdbfoITF2fn9OdUWYwi4szK0Gid zHkRe1HttXd9xNIuZAjJtiOP2TqDX31+7rRhvj1OA9p2fDZbtO1/Lg3RgRZiDpbg1ATh ADSWO7BK46JNYQhtIAuTBmJSKaSHCLj3/Msj0G+EBVRtGpzyKXKqQ2/shzqvixadTNbY 7MmmATCwiTEYwtUDZM/ZculUJc0qMZrBae29QkqFZhcQglcarSClCR4ACPo1iYiiVWHL u8alW5f5r+bttIPWQS/QGp+Pi+VpMvQv4pHyEIMLTKz7zjMdArdF9U9ut3ouljVfqWkq QG7Q== 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=NYAR4kNVKUa9+WzKECoxvv/vwc4Mz6zNEBNY45zjRxA=; b=TByS89+Pa+KoTaITQhEmDG7mz0YeReCztxOLj8Q6r/Y+RuQbi1jx+Jtk22nC73MJcN wloYj6E+MncAzzbNwD8IwAbmVQ1wtZ816sOk8P0S5abRgTbBg4U4OyGezMHIc/sP5/0f oH6rcRtoZ1nJFufJPIwVN8pphQVmDHYTPU+I6wmeARiXOR3asOM7jhdlGyrY5EHeARy5 zwnSX3YHt+lBcIc2LMRlaAmRaPhwFaoCTZMsljpMy5k1zqiMQAd9XXyfi/Lxa7YsOpn9 LQVhUbb6obKYC9Rr9fILfe2CUNtYH0Zc7vkYgsPVViBOExyrBPgC9zYopfHAtt2bDb62 AjUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ubEFLHpm; 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 o22-20020a056402439600b00423f40b8548si16348162edc.579.2022.04.26.01.21.03; Tue, 26 Apr 2022 01:21:04 -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=ubEFLHpm; 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 E2CC468B2F7; Tue, 26 Apr 2022 11:20:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D4DD68B29B for ; Tue, 26 Apr 2022 11:20:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1650961228; bh=+fl5Iu3VtJbsnzz2SxWJumbieBGcisOUwTTgMzVhdvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ubEFLHpm3gETMy9FuQAI2BxSiKxzDCMACAjqL+qMA2cg83fAOlqgsoqPzh7oyhFts BPVMdNlMe3vBgxkB+qgMaKIsjj+b7v/voBId00A/fvV/0vFZM8FWaD3uYrACB91hdG a47qhg2zLMRT70n+IW41KoBVQW2H7Z4fnvKtvYMM= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.52]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 51A3A6B5; Tue, 26 Apr 2022 16:20:26 +0800 X-QQ-mid: xmsmtpt1650961227tzai09piu Message-ID: X-QQ-XMAILINFO: MXdylPHsT1M8MSe3DfnsYe9QAsx9ROCcC9Tl1zwJBolKLVZUXHhx9U35lIgGcr iku5POsAA964GynBGYrvSrAJuDfFr2PTblwbD7b2IFh9xtlrXGutEPZkpf2KGdnSptW/JxzMuRQG Ds9FVfcEJQDGn8moCLS3WYUfXfHwCFu+wHFagafIIV3nQ3Hv1cp7WPblo5Rgl5eXThK17+gVFQET +V2MLI8cfJh738/ByHptVbiR1Cr1DnaODEhN4eFqccuuZapSJ18TV90E0y1tx/ZNn/VwovReu3FR xhz79eKaMDn8Fk1nYCSLo0/U7IfoOe7rWI3aGm3Y5jiWXpTWJnya2IP2JQPHcmsgA6qO7XgplIyB peGZ6LlCLN++zA1lHwK77di8cMAEQNhtOBqX2DnfLHGry8h7ue234aXj6ZPMJfYD2dPGuQ1o3CI/ XD/TQDOhiS4v/lwthei9+ET1R0NcueEBUGXNxnHzbDGnSYwTAo/knCoMs3bWRnsRRRQUTE2CXh3b DQMJjQ9kYKFbFPS1id+lCXanDs5cS6K51UIFWg6ajhZO1mXXvdi61C4avtw5+HmEB/UCrBjhPoVa tVHQTu2d0f+SoyFuMpksGS3C8c0EwH7haiW6C4NHD6E/fDr4r9z14QOKo7KRR2FjvG1lGxAT98Hr 9AZOlx/9UGD/bq4vR105fGbn1FWmcZol6PVR210iYnRmS7Djl8Cr4raQSzBrb70w59vBoBk2NqCb 0s+khQQ3Fo0BytdBEqJb9PLBgQ+U+C4MUmpmaTzT8v/KrqmXGPyZLLM+vqwRC1ljfGGmEZZzJW7Z kmBjaJhBQodEKYWihX4cLSYUoQjIZoVxb5Gr2lYHQQIo5a3JGNmCSZlMuIfV3uxsOAO3/3N05K3Z 7uaMwNcqxtcoZCDAL+GuRR3Q2jpvqF+OQmmeV3/EQrSxabTIjcYLuvyZiLYdeyt0WpAbDlRS61 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Apr 2022 16:20:25 +0800 X-OQ-MSGID: <20220426082026.85353-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220426082026.85353-1-quinkblack@foxmail.com> References: <20220426082026.85353-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mov: reindent after previous commit 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: P+V19tWMYX/F --- libavformat/mov.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 6116078b1a..e948c6cd0f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7693,12 +7693,12 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) atom.size = INT64_MAX; while (total_size <= atom.size - 8 && !avio_feof(pb)) { int (*parse)(MOVContext*, AVIOContext*, MOVAtom) = NULL; - 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) { + 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) { uint32_t type; avio_skip(pb, 4); type = avio_rl32(pb); @@ -7710,22 +7710,22 @@ static int mov_read_default(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_ERROR, "Detected moov in a free or hoov atom.\n"); a.type = MKTAG('m','o','o','v'); } + } + if (atom.type != MKTAG('r','o','o','t') && + atom.type != MKTAG('m','o','o','v')) { + if (a.type == MKTAG('t','r','a','k') || + a.type == MKTAG('m','d','a','t')) { + av_log(c->fc, AV_LOG_ERROR, "Broken file, trak/mdat not at top-level\n"); + avio_skip(pb, -8); + c->atom_depth --; + return 0; } - if (atom.type != MKTAG('r','o','o','t') && - atom.type != MKTAG('m','o','o','v')) { - if (a.type == MKTAG('t','r','a','k') || - a.type == MKTAG('m','d','a','t')) { - av_log(c->fc, AV_LOG_ERROR, "Broken file, trak/mdat not at top-level\n"); - avio_skip(pb, -8); - c->atom_depth --; - return 0; - } - } + } + total_size += 8; + if (a.size == 1 && total_size + 8 <= atom.size) { /* 64 bit extended size */ + a.size = avio_rb64(pb) - 8; total_size += 8; - if (a.size == 1 && total_size + 8 <= atom.size) { /* 64 bit extended size */ - a.size = avio_rb64(pb) - 8; - total_size += 8; - } + } av_log(c->fc, AV_LOG_TRACE, "type:'%s' parent:'%s' sz: %"PRId64" %"PRId64" %"PRId64"\n", av_fourcc2str(a.type), av_fourcc2str(atom.type), a.size, total_size, atom.size); if (a.size == 0) {