From patchwork Wed Feb 14 18:24:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b819:b0:19e:cdac:8cce with SMTP id fi25csp115065pzb; Wed, 14 Feb 2024 10:25:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVlaQExuKl8Euoi92KPHJkgWgCjabvzHi8k0rloDEFRawawczJgW8GGWOVTOCK6AAiKOu0Wkjl9yGvew2HhhheTwUg76rHjbq56tg== X-Google-Smtp-Source: AGHT+IE/FNeChz+FRD4SSsqc2anMdCdxekto1JhHaRlS3S5q5cw1xlyVrgCgWhtjsgnsEs5i6QYt X-Received: by 2002:a17:906:3ce:b0:a3d:1c99:71ce with SMTP id c14-20020a17090603ce00b00a3d1c9971cemr2311307eja.32.1707935150852; Wed, 14 Feb 2024 10:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707935150; cv=none; d=google.com; s=arc-20160816; b=0c8oN1vfWRuUYbm7iJ3TAC1JET503bODrAyNXHkeTGpZaB9SKnB4mdZiD0DOSBvtAY mnuNoCLlr/d17WQNBRq36V+swMzOWck3ubjp09FseUe2MT/uJHOHX9kl2wOilYe0OV7/ sKRvSQMyr68CLBFwpkb1Vavvh5e32j7Zl3jNSaQpvQwK4uC4e9zVhdDozPgycKOE4aq7 zF6zZqBrBw2hxfGhDuAnm3HrIZMriTpuAKt2ZsCSNZWDjP3VMl1QPXFfGu8f+7mPr6ZA /5pUQKpEyfw1vgMI5G53/1I/LH60tUFBahIb8V089vCoQE5T5Psnz28RZM1BW/w1Xfuy nA3w== 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:dkim-signature:delivered-to; bh=9WqZgWE4NeGIm0kff2wEbg+Lu5IUXIUqwx1u385aJek=; fh=2QLG55BixLvVXjnvHjuTdQmzo6u5LLKPXlOmJlDjL74=; b=zeZ5RvR/3Uy+O7VMdOad52cwB5++Lyr5kE6CyJw/tmD+MM4U0B3LHz/PfrZNc3Yhtf 0LEgQDqc4S5NUalBo3KQkHY58SllfC370zPzEnrTe2Nt41rWPl9MFuyObgsojPLNIqu6 qpFgpuEAmoXlCBf1LwuIvmje5/Rm9UgaUXo4MSRQIKJ0pdnVBhnOhaxX78nU4kkxcmLF QdHKfKEEJyl2Ry13itbqrnOSxgNyx/EL8Gbqgtx3Gw1gpvztQxAEuvW+zcSjKfb/G6Zq eANaxc+EzJonjeXwx6d1LPKRH0Esj1WfPvHe68ImkKPM+3JGv4+0iHs5puI1O4os4GA7 f44A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="XNnB0h/z"; 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 X-Forwarded-Encrypted: i=1; AJvYcCUWFAmPpxFMwFBDOSp4R7dLp9ofgABannOidoPhIuKjiAWAAm4Kl2aruyVeK83KOelu/wrnmPQMVIf+64UqDdafqjlJpiy/UHaMkWCfuuBv7UDEL54mO8QgKhyuNDypn18RIX8zLLGFOIzDQNRSBAA2d6wXhl6gmphkoO+vF/7AQPL/zNItQ47DNMYIJ3sqi2fJtI7C7pWosHMECyIbuctHoI3f6Nz7LSjGP87cLX6LdhJ3ubr3LSfITPw0KHkg46FQp5fX3vmkt9AzLzYNNfm8Jb6t8+1sblZeacqaUZaRGai6kXoz9cXWusEegL7MDi9XzjgIWKnMUg/GJ2KIkK2PdRgjX3NYXenZp5uKiJwVulZmzd1vK9Cp/XewujXUBORRPNyl7EGhfVshds0UrIZ+56L7o5rO4PiJPSJk58oW/fERtJABTa0iSAukThU8UJcx3qtXs2daBLHeo+HdBBqe8UYckU7d8GptIu41A4nGVjYjW1KOCa4R1BxKHNmEJ4vdFAAl5x1ZEz2eV/tBWp2OCC3bhkntgDJD+fz6c5jRYmKcMFnLN2KdB8868UTKzQGJqHwW8NlUQFqgfwwTIM/sKWoXIyDeFxLsxH0XOll4MbiBRmEMEJomXZxmo2eSk7Y2RXuhLde8fDvaVyonRR+lY5W0EAxdTTJy3zjo9kSNnnKBCpUh69AuOfVwDoIT+gI17rzKAeQl9P7QqOv2E45gPz9525fR6q95eH+DkEB97+58KG3jVhesAIR43tcpBk5Jfukaa9IhlgJZuYaZTzYDRs9gREzAJkgb2qSokNqZ5l4A9aUERcQAkMoM5lPEsfABmy3czWhfPyUJ1Gol+M8BujZn/pFrzROgUc4ykT7jBuVsmBqMxeFTLN2l+eMACk9MtTesOBrmfzhZHsO/O7pknObcy3AlaqiTpAYH5/INNLHDlltMxoO5y+Dzd8Rfrwt/sV u0qg/C90UDv5FF+LcGzy+SIshA0Lrv2MCvZwxj2QmWVpYzEUTg1Rl+uuCbjBVntk8ofwITG/JAndHGSbtxqS176T3+IRHyNGGkw3rLsTHlC2cB0VysJiFn/5sNUtOyTRY+bG9BlWEa5ANKG7/5L8FDhwbmpgyEf0rOVjSZiNpM5hhFDjXK6JRnB7aGS+pYZzodTJuYjurz/4ZQ58ui8Zte86b1hnEi5JUodnVGDno7vJlb/SWKSlqjB0CAg/IJ/rPhdwmcUUczwDP2tp3EK0w+hDBzd71/oDUfofMWy2BG5G77gaepyKliGn3iZcLfqoAWUtQEwJePYf5zkqM1hXj0Ts8IqqH2qjUQ9eHpaFtgDhZ4k18LPIeQLSkj3eEvgOy2xVDxczEztV8hFtAHcQRf6dD+msRSdMTLv8vq3DJua+ubYSK5M30JTnAlWgqIi6qTxLEJ7NFhkkvIaUSHQyNuD2MoirLEK+dSpIsBQb14M9ssFrihp508jr7HcVVJV0+3foDfoZ+0+Sy5OeIFb36snJn3bQzAj+9GssR5x+THdhn0rl9H/Np4FTfC+69zTqpsfhKsEsRKxf13/jTVplUkGokgpMewr3z6JZkxSPolomxFIkY9R4+2ZYKF1d/EAuFrouo= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z17-20020a17090655d100b00a3d0003c2bbsi1764173ejp.1053.2024.02.14.10.25.50; Wed, 14 Feb 2024 10:25:50 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="XNnB0h/z"; 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 C5AF468D23B; Wed, 14 Feb 2024 20:24:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3585668D225 for ; Wed, 14 Feb 2024 20:24:47 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=XNnB0h/z; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AF408448E for ; Wed, 14 Feb 2024 19:24:42 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id g-eZR5iAd_xm for ; Wed, 14 Feb 2024 19:24:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1707935078; bh=H/oyltprnkaTAaXloJqmY3+snLJ7COz4yCo41qr3VWA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=XNnB0h/zTqz5eeTlsRNtfaTLF0fq9gMHam6lzY+bnEP+6jCHc3EziPBnNGsQCSdV8 vLzBmDPeCBNwtchUUhbreRVQmL5G1nf2jnTqe2OMcFBn3JSlTO2ECnqlHhqBcYukQY z0PLs4TfxSuMjCJokV0E+4VkD6Uh5+wkq/2XqfBs50pOKi81W5q+dgFzVdPdHpkWPH dYcImLX6MGNSKwE1RAr/+R8cMoXQh3HOnG/VNCpR1uuaFIyk0s3ZhfB8zSsN4Se8VB 0EwqZkMb4ZqQSHI8jylo89gJ/xxQAvxyfrVMWTunmV8QzzVfm5bIubhIKrVDD/jwDn jnvCScMTxKfsw== 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 mail1.khirnov.net (Postfix) with ESMTPS id ACD574D03 for ; Wed, 14 Feb 2024 19:24:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A16D33A0534 for ; Wed, 14 Feb 2024 19:24:38 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 19:24:33 +0100 Message-ID: <20240214182435.31380-8-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240214182435.31380-1-anton@khirnov.net> References: <20240214182435.31380-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] fftools/ffmpeg_filter: drop unused InputFilterPriv.ist 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: oxas0LPKUntg Outside of ifilter_bind_ist(), there are no longer any assumptions about about filter inputs being fed by an InputStream. --- fftools/ffmpeg_filter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index a13b2ccf95..dcd08dbc36 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -109,8 +109,6 @@ typedef struct InputFilterPriv { AVFilterContext *filter; - InputStream *ist; - // used to hold submitted input AVFrame *frame; @@ -124,6 +122,7 @@ typedef struct InputFilterPriv { // same as type otherwise enum AVMediaType type_src; + int bound; int eof; // parameters configured for this input @@ -665,7 +664,8 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist) FilterGraphPriv *fgp = fgp_from_fg(ifilter->graph); int ret, dec_idx; - av_assert0(!ifp->ist); + av_assert0(!ifp->bound); + ifp->bound = 1; if (ifp->type != ist->par->codec_type && !(ifp->type == AVMEDIA_TYPE_VIDEO && ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) { @@ -674,7 +674,6 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist) return AVERROR(EINVAL); } - ifp->ist = ist; ifp->type_src = ist->st->codecpar->codec_type; dec_idx = ist_filter_add(ist, ifilter, filtergraph_is_simple(ifilter->graph),