From patchwork Mon Sep 19 15:26:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 38049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1309477pzh; Mon, 19 Sep 2022 08:26:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5JGZ0cay4kMCtr/j/XSbIgJEwQokpuEd5pVAXEe5ZLm2/sSIhf2WIhGUiqLg89tld2syTP X-Received: by 2002:a17:907:6d02:b0:77c:142:b3c5 with SMTP id sa2-20020a1709076d0200b0077c0142b3c5mr13153552ejc.280.1663601200806; Mon, 19 Sep 2022 08:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663601200; cv=none; d=google.com; s=arc-20160816; b=Jw6mRSdV0BFT8v/FuoGetHKTwofhiQeD0VdEn/pQ7ZSuri38wNiku05s6GVCjhtuJ/ bWp2nnfHNeig6GGOCKI76y3FjZVNq/edkqW4Li6Ily37GiwxWMIWiNSifM1ggdho7C30 Sb6x4qXGshH2sekB2ZJee36PFC6ltg8pmY6WHST2Uynot3EA9YwEOe0mcY2Llv2Jb8Ro yGTx3zz/XJMc+WvepmbtyLLxHFOCOKVlkAqtXd8jI2RqDuiroqbIp9G0lTY3YW8YCNoa fPKG9jRbimbJox38eS3sj5CWomu7aBtFS7h6mhaKtFnBAPV7lffFI9dmf+HKn/4rSMBA IP1g== 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:message-id:date:to:from :delivered-to; bh=y7Xqt1+P4Y1Oe+GKfT7pe9kmX/k4MvPLt3F1OyNWGpM=; b=OQhTdYaWW8HSFqNaZusdYdOlXe5MgKaBnTHQl3gXZZnavET+qij/xwPDownQuMsSTw Saxg/jatoxNnfGxjNas+xwQ2AouAdDKB3CUByLMucbSMLTU/VkHD/f2VsXAo21RbraAJ VtOFG5r8XRnCCeUXLeCHuCYQwT1+CC/SmR5M6OZyjxz674sFSsaTYTXyKxDF8zo/CaTQ UjwV9ol4DwH3ayoleRaDifnIazAzkNCh+s3+rTfAoSsOjYl9nFtaWsfEpj/ZjXn9obq7 f0wD5bEOh54Uz2QLDO2+qEtJt/tSl1RJ+CWwu+R6M06SHrLS1UhWDruSoWdMgEyBk+cs hu0g== 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 xi3-20020a170906dac300b007800b181a0csi9088681ejb.300.2022.09.19.08.26.40; Mon, 19 Sep 2022 08:26:40 -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; 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 7021568B69E; Mon, 19 Sep 2022 18:26:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F27168B69E for ; Mon, 19 Sep 2022 18:26:31 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id q3so28217336pjg.3 for ; Mon, 19 Sep 2022 08:26:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=LwJ6O7aDDQ4GYNuXbp9RU80i97Kp75Y9HEIg3tlVNeQ=; b=GtmWdwEJDFbpQm8t+9+smmusrqGuVPmLbPQImgoVWzEjfAw8O8zw7puuPhYah/hce7 r8TtWmkzgjgoPrfCEawD8sc8LAFFiIjGnPDwC76/J/WUqNylGsbh+UhkbK/IBTvJW6sM 54ZmLCn9eMKNIjjQuhKU6/Z1KxRhkhNknN30xmQ2oiivCoDqrNOdne8h4hePrNFbJ1v7 M9lpepRwQA76A9k30wvgXZeJichjHkn4kimqQzuNkRNG9iipV2iS+sFRRjmkm4NENGJG ohs9IeJWPGP8D8FQSOANqfsbqU/0j6z397UUUo098XLzC1yBRaNlwfXGjbYEQ8r9yjv5 PIyQ== X-Gm-Message-State: ACrzQf3hmUiY7QgFXH79dOycGjvSdQlTn77HAoCqeakB6txsw+FQ7+p2 N3KImgHqtwF1zcBLfyu5L9qe+dCbYTc= X-Received: by 2002:a17:902:f606:b0:172:6522:4bfc with SMTP id n6-20020a170902f60600b0017265224bfcmr253606plg.133.1663601188997; Mon, 19 Sep 2022 08:26:28 -0700 (PDT) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id s198-20020a632ccf000000b0042a93b625d4sm18827220pgs.27.2022.09.19.08.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 08:26:28 -0700 (PDT) Received: by localhost (sSMTP sendmail emulation); Mon, 19 Sep 2022 08:26:25 -0700 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2022 08:26:18 -0700 Message-Id: <20220919152618.1169-1-pal@sandflow.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] format/imfdec: improve error handling when selecting tracks for playback 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rr2RQgtqPPu4 From: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 5bbe7a53f8..9ba8b6de8b 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -681,8 +681,11 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma { IMFContext *c = s->priv_data; IMFVirtualTrackPlaybackCtx *track; - AVRational minimum_timestamp = av_make_q(INT32_MAX, 1); + + if (!c->track_count) + return NULL; + for (uint32_t i = c->track_count; i > 0; i--) { av_log(s, AV_LOG_TRACE, "Compare track %d timestamp " AVRATIONAL_FORMAT " to minimum " AVRATIONAL_FORMAT @@ -697,8 +700,6 @@ static IMFVirtualTrackPlaybackCtx *get_next_track_with_minimum_timestamp(AVForma } } - av_log(s, AV_LOG_DEBUG, "Found next track to read: %d (timestamp: %lf / %lf)\n", - track->index, av_q2d(track->current_timestamp), av_q2d(minimum_timestamp)); return track; } @@ -761,6 +762,14 @@ static int imf_read_packet(AVFormatContext *s, AVPacket *pkt) track = get_next_track_with_minimum_timestamp(s); + if (!track) { + av_log(s, AV_LOG_ERROR, "No track found for playback\n"); + return AVERROR_INVALIDDATA; + } + + av_log(s, AV_LOG_DEBUG, "Found track %d to read at timestamp %lf\n", + track->index, av_q2d(track->current_timestamp)); + ret = get_resource_context_for_timestamp(s, track, &resource); if (ret) return ret;