From patchwork Tue Jul 5 07:50:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36668 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3315021pzh; Tue, 5 Jul 2022 00:51:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1slDSwaVzZtMMJIxqbVhpCWW/Sz9y0Ld5fL2TA2bUFvo0Clfk0u9Pmrs2inYOp9lIJA5xJG X-Received: by 2002:a17:907:1c09:b0:726:b834:1a21 with SMTP id nc9-20020a1709071c0900b00726b8341a21mr32535678ejc.518.1657007476585; Tue, 05 Jul 2022 00:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657007476; cv=none; d=google.com; s=arc-20160816; b=ArPwlDRFKou4wzAqznUQIoLvzGTX4yNRqoNw1VYBi7Prb0NlezzJomIIO+TWsW87CD ynyCZxNFUTftzBQPtWjpnru8TFpfhoPuN+dxmBu2by1A79R0Mawn7b3ma1SL0dyF3bSl V+l+BLiZk+mpntXlRvcBwoy0XA7Enha3by6XvlAnZXTgP1o/WJ6cajiC3vk6kA/9rBX6 XuV/RHN/FGB/tC3BFxwBLabLc8KB2nN/D0GaLPNWKO7ceI4L7jvrXiou129H4bXfTzHi pAu/jfnpczI7cBWylF6wAnKhmlYhN0RiOwsd6FOWevbEGKpo1gb7xJRZDmAw2VJcq6PW Ereg== 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=4xyeu8ckbIObAaCJJ7UySTZ64KVofQmFKjfq8c16s3k=; b=xcLghtHO0tf70Gy3ZKpIqgDEtP4Vz6skH68lNTu2miNdkTareurHxz1OEzMOGo++uJ UetFldDDoprZ9z21LSm4twHn4/jMQ0lJIuHHAM4h6JYzXA6x8AAWQaAQ1O0lrgeo2Abp 0xu3tVQ8XpVsCP7IJNhTpwbw7lE7NMF3GgsKk35ktyETFJQbdRfrUp285p7fwV/g10pK 7ROYa7J4hOLivDf9udyMAjk5CdYyT2YZ+7Cc357nzACboaywXmCpry2/sh6DLK1CXtAK PS1fpVuMDGw471ImpYRxDkF19vKutyArzLs3FO4UM4653QM6oBT6SeB2ALi1a0Majy3z O3sA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=X1yzweqV; 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 e17-20020a17090658d100b00726ed232bebsi16719780ejs.630.2022.07.05.00.51.11; Tue, 05 Jul 2022 00:51:16 -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=X1yzweqV; 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 A691568B8A0; Tue, 5 Jul 2022 10:51:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-235.mail.qq.com (out203-205-221-235.mail.qq.com [203.205.221.235]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93B2668B85C for ; Tue, 5 Jul 2022 10:50:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1657007455; bh=B4av8Ru7oVCuCQYvV+/npe6IaRRfkSPKZM9HfA3/ouU=; h=From:To:Cc:Subject:Date; b=X1yzweqVhoOzlOkb96yRb6k2Z8XUTItPTIKVIQwKW/iO6HfCeci2bFfQ8LHTLHJY6 eFQaIkLunIGSA9r3Wh9iR0okdkn/Ei5pWejN8XkCTrUA1F29ePzbTf6MfOkI2Y9Fj4 IT/H3pCzWaUFKCwD1DDF04qf8/ZttR/dI3Nn8uA0= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.70]) by newxmesmtplogicsvrszc11.qq.com (NewEsmtp) with SMTP id CB589093; Tue, 05 Jul 2022 15:50:53 +0800 X-QQ-mid: xmsmtpt1657007453t33xde5jh Message-ID: X-QQ-XMAILINFO: MNQ2FIpgVwZbfumN6f/1E45QiPHiGQ0JJxqPDqDNC5l2P8llyyHXamZohUfpXa btroJge/O5e3IB2q5S8wl06ZIQWmUKGNoTk6OVWRhq+LhDlG5j8ZYg+ujuOE5pA0GNcBxQdnfNbD p49BK2dzPoyhv7/osYGoIgxvR6+FMyWYEii5BL3jY9BLLi/ql9jzVWez8S0FuK2F58Lo7z7NZoc0 Iwb6mTzIdzD9zhttSIOxvTip/vp3KwP1VuVU3HQf6YNyPZrVr5BFscM2piySMwyWcOQSzOZLse4c 4lQ6fucma41T/feYPfTSnfVI+J6JKTNiacDIyuZU6Jrkt7N7rg1YHqHTeMmYfgRShS421bLDR7Sl PDwRV7X05wuM8Zhj7OqrQiEfSO20Oddx8NWNyuR4znGw5xqTYTxt6Y3ZBfpXPa5KrueSnjJnhuL8 oBgOteikFatum5PgpzfULH3Rc6vnEl086b0mmNGMiaqKiTUHnen4Ph8nRQTHoHI1tHafXgdMq/Bl RR9ZwftZfRpFTHmsL0GcLgmFIDl+POEPoXj0Nr6wrex0NnevA+hB/0sTPPsihDvraDGJA6VgRmpz fO9KzKARQMK+5No2QFTZoiLgu/lotjKcaNhz/5k+IMoIcMKsQvPd/N5zCbMPkuPMksAOeimkqCxh C591a15vdvVthhR1donruNdg2RKrKMpuVFtGLwdiYWk9SSR8a7TtgC1/Dvr/pR16fyTr1PXYICjc 272Y5X3DZqSLRk96nuEfQdRR2+8k7/2PDlE+rKSp+FksZnzfUr2M0eW5WuQXIz7zlccPEnXL2Nhp L/Y8IYOOIkGimXra1Jrvu/nzLmk45OOVvLovGGEhdoekm3DSpGifl8DgOHq8Mm8x/3XdIsrT7uVW 6NB0IbGI4LH+TMoXcMemU9aI4Cw3aCCIBlxmy0P/s/IjFLz9ikShWOVU6YdiFK6yv4eSfeRFv7qJ ORgAxe2NY= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jul 2022 15:50:47 +0800 X-OQ-MSGID: <20220705075047.76348-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: discard data streams with all zero sample_delta 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: ChISu0kepZoT From: Zhao Zhili Streams with all zero sample_delta in 'stts' have all zero dts. They have higher chance be chose by mov_find_next_sample(), which leads to seek again and again. For example, GoPro created a 'GoPro SOS' stream: Stream #0:4[0x5](eng): Data: none (fdsc / 0x63736466), 13 kb/s (default) Metadata: creation_time : 2022-06-21T08:49:19.000000Z handler_name : GoPro SOS With 'ffprobe -show_frames http://example.com/gopro.mp4', ffprobe blocks until all samples in 'GoPro SOS' stream are consumed first. Signed-off-by: Zhao Zhili --- libavformat/mov.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 88669faa70..2a4eb79f27 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3062,6 +3062,20 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) st->nb_frames= total_sample_count; if (duration) st->duration= FFMIN(st->duration, duration); + + // All samples have zero duration. They have higher chance be chose by + // mov_find_next_sample, which leads to seek again and again. + // + // It's AVERROR_INVALIDDATA actually, but such files exist in the wild. + // So only mark data stream as discarded for safety. + if (!duration && sc->stts_count && + st->codecpar->codec_type == AVMEDIA_TYPE_DATA) { + av_log(c->fc, AV_LOG_WARNING, + "All samples in data stream index:id [%d:%d] have zero duration, " + "discard the stream\n", + st->index, st->id); + st->discard = AVDISCARD_ALL; + } sc->track_end = duration; return 0; }