From patchwork Wed May 17 10:20:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41666 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1078543pzb; Wed, 17 May 2023 03:22:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wCKXdV566TNYqaW/ySWJYjcvYNt533P0cAGLsbMx5/tZLZuzEOAUt3iFUaJ+i1NGnBU4N X-Received: by 2002:a17:907:8a07:b0:968:c2c2:3a21 with SMTP id sc7-20020a1709078a0700b00968c2c23a21mr31782228ejc.12.1684318944684; Wed, 17 May 2023 03:22:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684318944; cv=none; d=google.com; s=arc-20160816; b=LAB0jEdY6QYIpZcE8UXRBZbnrn1PeCV97Lz/qGS9m+53o+8/en1gK3ay58qISnCHDM RHrP6e17nWPFZRs/weu6zKJHalAJV7zq0hnJhlcTTPohklnAiGtvmb5dV5NcTPCJpZEo i4C3kF/BV2/2T9ZMTWF5YIa6nIPJRNAzAd/C4aYTko5hi2ZwIYz7zPk/E2woKT8VYQDM qhuslC4bOTh4RxaXCmhxAcohJz00cr6ClukO39kiXixEV0SoU6QY4C7liDeAtUw1Fqj5 pvNqn6yy2Sj1Ilg9Rcw1eTlgJcSlOxxHu+SbaNjXykwrBn2XPEgjB2rHksu4t7LiPyY/ mqgg== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=2I3Cue05RdwPdDC17UPYh+8xGmGUSKLb04anGtyGVxw=; b=tQdWVghLSGRsORJ6G7aNfSRqAzL1inzmMaOY8SZCdDKreoVN9/gD27nzqNSUBNbAA2 m+xYydTOk36jA9ZIXi93peA3KatOXOIFQHfdBktsuzIs75aKvxL6pPkc9mAFZaIJ2Rrn WjBgetyb19/27GN/SwgVv307DQdfbzLvHw7hQ9NvMFTV8P/y+opSN49oVhOobQitOlYY 7lhCDbbocd2u3+dt69WtE3JflDf5tbl0Bk1Q91oapRh2/uPaQc0rCcipWeBmPv0SGIqw 55FgMasAMJ15YzY8nsz1q/GaAq2oyQqds4kV3j/c31aOPBp30GPkRjSdbBrPKt9miCV2 cLEg== 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 y13-20020a170906070d00b00965d9892ba7si17626427ejb.551.2023.05.17.03.22.24; Wed, 17 May 2023 03:22:24 -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 B031668C193; Wed, 17 May 2023 13:21:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 718CA68C139 for ; Wed, 17 May 2023 13:20:57 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8FBE7240177 for ; Wed, 17 May 2023 12:20:53 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id QKfwejgm4Ivg for ; Wed, 17 May 2023 12:20:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 31FF1240D03 for ; Wed, 17 May 2023 12:20:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D44CE3A163A for ; Wed, 17 May 2023 12:20:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2023 12:20:04 +0200 Message-Id: <20230517102029.541-11-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517102029.541-1-anton@khirnov.net> References: <20230517102029.541-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/36] fftools/ffmpeg_demux: disallow using disabled input streams 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: +aYRSyCr7196 This is less ad-hoc than checking explicitly in every place that binds an input stream to a filter or output. --- fftools/ffmpeg_demux.c | 6 ++++++ fftools/ffmpeg_filter.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index ae2133bdbf..df87e0f30a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -848,6 +848,12 @@ static int ist_use(InputStream *ist, int decoding_needed) { DemuxStream *ds = ds_from_ist(ist); + if (ist->user_set_discard == AVDISCARD_ALL) { + av_log(ist, AV_LOG_ERROR, "Cannot %s a disabled input stream\n", + decoding_needed ? "decode" : "streamcopy"); + return AVERROR(EINVAL); + } + ist->discard = 0; ist->st->discard = ist->user_set_discard; ist->decoding_needed |= decoding_needed; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index ca43b4803a..2c3e2a96f7 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -417,11 +417,6 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) exit_program(1); } ist = input_files[file_idx]->streams[st->index]; - if (ist->user_set_discard == AVDISCARD_ALL) { - av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " - "matches a disabled input stream.\n", p, fgp->graph_desc); - exit_program(1); - } } else { ist = ist_find_unused(type); if (!ist) {