From patchwork Sun May 28 09:14:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp987462pzb; Sun, 28 May 2023 02:16:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ii7Qj6QEPj9SlFQLN+h8Xaj2CXwlj/gB/WYz8hBkEh1SPrDHHU+Xe8WkbhgGV9Y1Bw/y0 X-Received: by 2002:a17:906:9b85:b0:965:9edf:f0d0 with SMTP id dd5-20020a1709069b8500b009659edff0d0mr3722115ejc.13.1685265364202; Sun, 28 May 2023 02:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685265364; cv=none; d=google.com; s=arc-20160816; b=SToHFA4C5F1wxOniVQx8GIMipK2r1luVtpd43L+Nygns/5A8L9IpzKJ/Wcgc6aV6i8 QNegRYCzDj70d62S4uBVJYebVTMv8lhHq/kenGjjdC390YoWUFeQuljPJvwaAe+hVUxX o2djentDYL0wayKEvk89Yz2ieXEpEEnHtZzWn5UmwfGGRhKIY0czxo8xDvOo9ltLFiEy 7nFhnTpZW0ieYs3At+HRrRdSzvA2idLj9oUp18DDlsxWa7BI5HY4fhGp61UWZR9Du4SE /ea+qIr6uHkYJ5OkB92v9V2CmfYefuxcQ39OQUmzCahwE8+0pzK11lxQu/dFSbBr0a+E 5pjg== 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=qFcyUdMvD6+43VNN2lJfKFW9m1K4qBbr/oMT4gD5iIk=; b=o5huEf+RRy4Q+ufi8TwbBdyUbX/KJVeFLq+l+OU4pjMl2KL13jJFRU45wc0xo3fkFH Y9/OeVkJPNJCTM2PkTkLuECZxWNv5MXj+DxBvNeUlMg5WdNmwjieBEQ98PvQRmYbPV8P t7lo2sQ0D59N6TG3p/BpclfVe2tHlQZjhpRonrSzD326RnffowSzc9yXFwHWEvrABf3W 1tnrPbm1eSIeymBGb0yegxKtg/al05TfV+iZOH1E4PBXkVOCWl3CIuSvyDoKlmmN/nyg 2PlgqXetkGWKXN/nUl3R0H5Ot9C7WR9Rw8BEzN87CZUGbXLTLud8EUU749Bq12o6mrDT LpRA== 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 k7-20020a17090632c700b0096f655876aasi140201ejk.879.2023.05.28.02.16.03; Sun, 28 May 2023 02:16:04 -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 72FF168C23A; Sun, 28 May 2023 12:15: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 9B6FE68C1ED for ; Sun, 28 May 2023 12:14:55 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 593092404F5 for ; Sun, 28 May 2023 11:14:55 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dVfo7CSn26Yp for ; Sun, 28 May 2023 11:14:54 +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 B2A582406CE for ; Sun, 28 May 2023 11:14:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 6C7553A07D2 for ; Sun, 28 May 2023 11:14:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2023 11:14:01 +0200 Message-Id: <20230528091416.17927-9-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230528091416.17927-1-anton@khirnov.net> References: <20230528091416.17927-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/24] fftools/ffmpeg_filter: factor out binding an output stream to OutputFilter 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: PPoYqOx7zS4l While the new function is trivial for now, it will become more useful in future commits. --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_filter.c | 10 ++++++++-- fftools/ffmpeg_mux_init.c | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 3aa19c7f5f..8c149f1f95 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -756,6 +756,8 @@ int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec) int ifilter_has_all_input_formats(FilterGraph *fg); +void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost); + /** * Create a new filtergraph in the global filtergraph list. * diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index d74eeef52a..5f77f1e00f 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -464,6 +464,12 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist) return 0; } +void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost) +{ + ofilter->ost = ost; + av_freep(&ofilter->linklabel); +} + static InputFilter *ifilter_alloc(FilterGraph *fg) { InputFilterPriv *ifp = allocate_array_elem(&fg->inputs, sizeof(*ifp), @@ -624,14 +630,14 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, return AVERROR(EINVAL); } - fg->outputs[0]->ost = ost; - ost->filter = fg->outputs[0]; ret = ifilter_bind_ist(fg->inputs[0], ist); if (ret < 0) return ret; + ofilter_bind_ost(fg->outputs[0], ost); + return 0; } diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index f7a24feec7..99708b9621 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1259,8 +1259,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { if (ofilter) { ost->filter = ofilter; - ofilter->ost = ost; - av_freep(&ofilter->linklabel); + ofilter_bind_ost(ofilter, ost); } else { ret = init_simple_filtergraph(ost->ist, ost, filters); if (ret < 0) {