From patchwork Mon Dec 27 05:57:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 32928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp10030728iog; Sun, 26 Dec 2021 21:57:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+eUIO04jnyMMyHoIJdRwqjBVF5jMpylfdxwPSo4yfKGP9xNVL9B8baLgwvAiYYKujGQt4 X-Received: by 2002:a05:6402:2ce:: with SMTP id b14mr15230872edx.122.1640584659603; Sun, 26 Dec 2021 21:57:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640584659; cv=none; d=google.com; s=arc-20160816; b=sAGNC3jBgtVlZDB9Mnp7/hn1XpIYrqtUMUxAWFsStPw1Lh96RYsMpZhimEVQhghwZd XoTV6j6NQwmIAUmdLULeEPJ+sBYviIKY/XPFz7/6sxORtnAkiCHc6ApEqBGnfeljlBLJ ABxu6Sd0H32EiAjTnMl0eq3QF1+lZ6gyRXr+bXCoAQWJTnbIQ8dGg1wuG8oqVo15/bDZ FQ2WKoG8zFnvqZSUhwK27vcF0S3vJy/n5FtDnUaBn9cCpgWtWElkCiLWDC8snbVhrNBE 2Nmt627gmDKayKsMojjhrsafKo/h7PNd7JFuW78hyRzFJ3ZyHxkUpwCrI0TzGTAf/3C3 U+wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=jyK3YZQPX1Oj9JjA1kJAsE1/Y9D/wxELybmPUyz48tU=; b=E4bdd370QLa9hs8bPRNA66d5f1XSy4eScY7GNWEnHMrU1yG9ajxOVY3rAsRT184ulf VtAO4Mdh2VsIznZXJIj0n/Vri7mpc28OLHABs6iMyeejDKysc4XSXmqIu4z7EyGsgZ5+ XsTWBS8KTbQVc7sEKjxv+G2NHWCsRFc/6A2viMh9k4eoU5xVvt0SFS2lh0AyYIM4SGuh uDGfQlRFXkf/abnN0ZrfhIjsYgmHc42JA6tBn3RNzraFu4GBthBjrtCjfCHLXkKg5CIB GFOb5jv8YeGyyC/2Nw+JHv+1uIR/R8Mq4XyQQwUf7rpphdFHGr+XKkoStGHw31QDn7Vl aGcQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r1si5885206ejf.223.2021.12.26.21.57.38; Sun, 26 Dec 2021 21:57:39 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7618E68AFEF; Mon, 27 Dec 2021 07:57:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 213C568AF45 for ; Mon, 27 Dec 2021 07:57:29 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4JMn4l6qymzQjwk for ; Mon, 27 Dec 2021 06:57:27 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Dec 2021 11:27:10 +0530 Message-Id: <20211227055711.63060-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: correct 0 valued entries in stts 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OaU7uNkOsTnD As per ISO 14496-12, sample duration of 0 is invalid except for the last entry. In addition, also catch 0 value for sample count. --- libavformat/mov.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2aed6e80ef..fb7406cdd6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2968,6 +2968,18 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "sample_count=%d, sample_duration=%d\n", sample_count, sample_duration); + if (!sample_count) { + av_log(c->fc, AV_LOG_WARNING, "invalid sample count of 0 in stts for st %d at entry %u; changing to 1.\n", + c->fc->nb_streams-1, i); + sc->stts_data[i].count = sample_count = 1; + } + + if (!sample_duration && i != entries-1) { + av_log(c->fc, AV_LOG_WARNING, "invalid sample delta of 0 in stts for st %d at entry %u; changing to 1.\n", + c->fc->nb_streams-1, i); + sc->stts_data[i].duration = sample_duration = 1; + } + duration+=(int64_t)sample_duration*(uint64_t)sample_count; total_sample_count+=sample_count; }