From patchwork Fri Apr 5 16:11:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1068795pzd; Fri, 5 Apr 2024 09:13:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0pHU8alTu6z5ECwzH96CAvUlfXgyJycipnjWZcFJUl7duxijMfhYDy456PCgkszS+lzRlKAHZrAB1evrm0T9YYZ7H5P/A3bhTyg== X-Google-Smtp-Source: AGHT+IE8FPdWenAkT9cnQa0Na1mvnEsV0GNLvOJ8xIepvXUKvo7nYWNLt9Tqgx5Y0t+aPgm1TOXP X-Received: by 2002:a17:906:aeda:b0:a51:a0eb:91b6 with SMTP id me26-20020a170906aeda00b00a51a0eb91b6mr1143478ejb.1.1712333596371; Fri, 05 Apr 2024 09:13:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712333596; cv=none; d=google.com; s=arc-20160816; b=brBxdPylkdln6qXFg3kvnSKgK9OD4KJdMdBOaY9kvf4gkQ0hmRbjwTShpiiitnScir TlxbzUQtxxYvWLr14bWdaV+Xud9EZIXWLeCYZAuMff02WxZgE3swo+M2n5//kLn982K7 SP1KChRdjcc0TFPMbgUcpmWAvCmwXUKq+vPjQzqr+pjLHqlsscriWw1qk4zTnIIuANLl BfuZAVnPW4xRP1SicIM5l7SjAN/BHoe6T2uRFg8z4VeCSJq2y3Y1KT+0g2erdXUAAozh bonCx9ayN7xxVwxsuGzy1RobzVTw8Ij85voEnMwsR2hI8Bhk+7N6n7JaFdi5r3FOSnSV U2Ug== 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=/i/q6KGip83kJgegjb2hZob2NZKHY0dLMSscaHhyRJw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B2i+e5rtJtf3LD20mvB+kZQS7LfyRCx5KTtoMhwuJ2Yv7z+LnPboZdGtxtsyPoYhpP WXRbqqV54gHj6KvXPHO7yQC5T+M//OeQVabqLDk5w0AtRBiGfpb6+/70iqRFribHltZf TRnrGdgcZxoVnGbK4xkfAAvCsbjVcq+EPyq3/8H/sHDPhi0GSd4vC7n60KuCb/3avZDM Aaagk+5Im+5Y7d0s4eu28dQ70ZYILwm3gZdoG1Lli7C+tYviNFNfCeruTOrdbkm+ErW2 Fakbki5PrU+GZqCOe4UFucaBJIMjBxsjQp3Exi1qpkud8YNKas5sWfjbr+vsm8MYnOcF wRVA==; 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="O/jRJ458"; 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 a10-20020a170906190a00b00a474a3e1176si823662eje.865.2024.04.05.09.13.15; Fri, 05 Apr 2024 09:13:16 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="O/jRJ458"; 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 AA2BA68D1D2; Fri, 5 Apr 2024 19:13:11 +0300 (EEST) 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 7D9C968D10C for ; Fri, 5 Apr 2024 19:13:04 +0300 (EEST) 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=O/jRJ458; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 6870225F for ; Fri, 5 Apr 2024 18:13:03 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id SuRssl6cdNdO for ; Fri, 5 Apr 2024 18:13:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333581; bh=tUwM9Blnv46o5ZFLkpyFlRlohowJDflbNWM+HWJgm1E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=O/jRJ458URmPa0U7aaVssr9BgDCMfSagMcn9jpu5JYRCVgnTmdKUV0HPxRiTCayaY 0gPygZLsK4XDK0BQZk55f87pY4Kwy5axdTIWYWbDgWgO5aqkCIDb67fOeDA+jKvQO3 32+EYAaWrLRqUJhV3vfDIDnoxEkG7qjPUdD5N8hcjbjuPip3B+iKLRqJ8Ch6mPsxyR ynibcB7WAvj0Gr/ff7FYZ4VhQ+bBCNU5R4yWsMx5FyJcrXVnuA6UIZX2voBD7zjkp1 uuv2HMQIhrT+O/uzgPpHWZ0nkKbeQeCe7uljtiy8Tzl4FH6d/U71AeRKxSCcDc7weZ C9WCvHJSvMiXQ== 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 E7B7C4D48 for ; Fri, 5 Apr 2024 18:13:01 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A2E6A3A0C79 for ; Fri, 5 Apr 2024 18:12:55 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:11:46 +0200 Message-ID: <20240405161212.26167-5-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240405161212.26167-1-anton@khirnov.net> References: <20240405161212.26167-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/31] fftools/ffmpeg_filter: check that filter type matches output stream type 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: xV3jRXCEm9wH For simple filtergraphs. For complex filtergraphs they always match. --- fftools/ffmpeg_filter.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 0d359303f7..a59c61b312 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -773,6 +773,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, int ret; av_assert0(!ofilter->ost); + av_assert0(ofilter->type == ost->type); ofilter->ost = ost; av_freep(&ofilter->linklabel); @@ -1106,6 +1107,13 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, graph_desc, fg->nb_inputs, fg->nb_outputs); return AVERROR(EINVAL); } + if (fg->outputs[0]->type != ost->type) { + av_log(fg, AV_LOG_ERROR, "Filtergraph has a %s output, cannot connect " + "it to %s output stream\n", + av_get_media_type_string(fg->outputs[0]->type), + av_get_media_type_string(ost->type)); + return AVERROR(EINVAL); + } ost->filter = fg->outputs[0];