From patchwork Wed Mar 6 11:03:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d90e:b0:19e:cdac:8cce with SMTP id jd14csp313045pzb; Wed, 6 Mar 2024 03:05:48 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU5Zh9mR94CJ4JN6nmOEb2ZTltPKRwE09VjQylgrXxliPiVvcbQFSiVVL1fRpsY8tYSUMBrQg+LEzhsFaRKSdmy4wclfOy/LXvf6Q== X-Google-Smtp-Source: AGHT+IEj5psx3/utNEw6N5VuY2yY0Ja8iB68sXkX11gn0pF4RpSddHesuHa2EnIodix8sJzGGAoq X-Received: by 2002:a50:85c6:0:b0:565:9fff:6046 with SMTP id q6-20020a5085c6000000b005659fff6046mr11466206edh.3.1709723148357; Wed, 06 Mar 2024 03:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709723148; cv=none; d=google.com; s=arc-20160816; b=uy06f84N7lW2NWIEp3QMca0kgzj3wSjF8uevbZk9akJ9IppDl3zeoXdJap0MxNaZlI xcJVvCt3H77UMCk8kmth0yLXUz4ylpCmm5boeSYl1OtoOW5p1UgzLJ0XqICK1CPhnbxP 9m0ccvno4HsQU0iiG/i2sJbUPdGUDZQ7hBLzI2N1B24LAPo7upReQZhKjz+8gR/+uL59 2gmawnJDywPM2X5xaLzFTA1dzPz9Zt0vwVu3PSOriI2J9USXBkEHz1sk09mT7mXcSAWw mhWtSgcjFOFBEzyWUGkxN1K7AShH3wR/IRfBoU6A1956emmNaBR9BvSuJ+41MvUC4otd gPtA== 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=F9MhtIbxYNnCXoay9Ekx/+d5R2K7jnSzOu4plitCFdw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UljU28n1JrhXcLGdSuCjxtP8y+9OhddQ3nqQ2gqaYg+OBISYgER3rwzmS+8DwdlvLI cXCrP8keHS322Thre+V3TOcO+0y7/5nUARPzRs+3rTS3MCUIOgF9ZrtVOnv8PDGhv2IU dhkmEPe7nlCO42Sv3VPSnKpeKslxrr7UMQZLm5bwk6fuMy5FnQGpLRiAS4OXCFyVeeXu 3SGpUTHEHYs+1raFvL17dRBkJZAt3OgSOwJZx+OMNKFtk1/9jcqe8Y0YF9LcM64G2tfb 5mxDyYsIDgDpYu9V045ov011yHOFcx21k1NjoSBZMQ296X/BaDWFBfJjttfWcDNdq/kK U7cw==; 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=YGdXUUa1; 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 m7-20020a50d7c7000000b00567e2f1ad01si580926edj.684.2024.03.06.03.05.48; Wed, 06 Mar 2024 03:05:48 -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=YGdXUUa1; 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 1D30768CD49; Wed, 6 Mar 2024 13:05:32 +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 DD95C68B5A1 for ; Wed, 6 Mar 2024 13:05:24 +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=YGdXUUa1; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 7DB0F4D46 for ; Wed, 6 Mar 2024 12:05:24 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 8qFw8msNrsP0 for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709723122; bh=Yormk3XSmJcFShZUII08iRmEUXoWd4H3DhZkyrlOdYc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YGdXUUa1po4jtfYjCHyjcmFwyRsR7DY6BqVDB+PCYHuCuv3ld9roBPjqONSK0CiL+ TSP4zmf1drUkPlAle453GrUDzVGKMhhW1sfB1YH3Eu9iNiVjmZp4tvAdRnZXKhCySe fEWJq7kFWbMnth6wJ1+xr4GdU8IjKALiYylfsCnrNPPNAfF1ltCV/rplVFXkCemc9X smpvOjgyRfxZLsKxZmltUPEBYUPONesssYt5CRPbiVamb9127j3jRPtuWSC6c8TlvA 8G2lQvsX7fbvt/mVsy3MsemyUeuVKLzkYx0EZFC9jAnOIa02+s7cfUP2BdTrF1jKIR +zCUDxV+2Z3vQ== 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 B01F14D44 for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 98DB83A076E for ; Wed, 6 Mar 2024 12:05:22 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 12:03:04 +0100 Message-ID: <20240306110319.17339-3-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306110319.17339-1-anton@khirnov.net> References: <20240306110319.17339-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/18] 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: HCRQHx8Qjgt9 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 9d9762a599..37705297fb 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; @@ -125,6 +123,7 @@ typedef struct InputFilterPriv { enum AVMediaType type_src; int eof; + int bound; // parameters configured for this input int format; @@ -664,7 +663,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)) { @@ -673,7 +673,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),