From patchwork Sun May 28 09:13:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp988113pzb; Sun, 28 May 2023 02:17:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kzHs+N70iLAQ+sno/s7Hurc3M6s6v2mefFp35tKYXvhg/UJ71mhkolid6pc46/uFS52bH X-Received: by 2002:a05:6402:b31:b0:510:dae0:2c3f with SMTP id bo17-20020a0564020b3100b00510dae02c3fmr4987191edb.37.1685265437553; Sun, 28 May 2023 02:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685265437; cv=none; d=google.com; s=arc-20160816; b=KnRRIG9TIJa6A7WvBuMpAt1J5XCiuTBnJr1uSvmD+8LeV5947rmU8BjFxn8ENO7RUD dKYlIz4KTi+q0PLPp91fvLh1YGTrqqIKYhcDo1rTyax5NBWJtji4U/neYJueR7/K4mJp EYwSoq+fRz9RA2Tvd027cBR6gL+WAisCAkiDSQmeb9oK3WXI4RWZlctVPPdkupiseJlZ esfFzqJlJONIP2tGE3x8gBL48gj6YYbUa8dJsaTxXLHW1SAq7p/Nzn3cRPh6qWd6dbeQ afnSYrhNxwB5rI8Z4/uxYaGhy1OfTqir/IY59vgqSxHxpdoWqq0uwphAoNCQg//1r3qC 0W5A== 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=UHGlTC4ax9IpZdkI6iU46DMPbTT/hku3HVk2mLorpVs=; b=oREgF7UlAmkV3VoTHHYYdsfZhvv/S04fPRejAbJ88BGVylm1aPmyoZAJ8vrPxZy+rg D11m+pAtK5/vTDzkGHmLxfGJyLPS/IwCM+W0gVTuZWylLLDKr1NNKK0tz0CimTogrgMv H9h5jSGQ4DZGXiUGJQl/SuF9rECbN3w5oNT/QFiFjsQzDhojbpn4QQksCzazR4QnUnOs 2MP6R5JVGzZVQC6e+J15SgPh2memY2hJI2Q/0o9uBMzi075bHxgK2Se/bUtVEJAfeHZ+ cHxewCoplKn0MZ6f8TDhqrVdrmnjW4Tu4/xk5ccf+X7PEBJDfL9xdRWgHtwjnS1itghK t8EA== 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 m3-20020a50ef03000000b005060bdc3b1dsi2892863eds.83.2023.05.28.02.17.17; Sun, 28 May 2023 02:17:17 -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 0564768C20F; Sun, 28 May 2023 12:15:11 +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 0A1E668C20C for ; Sun, 28 May 2023 12:14:54 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 95B78240177 for ; Sun, 28 May 2023 11:14:50 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MG7zbMQnxJlo for ; Sun, 28 May 2023 11:14:50 +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 810B72404F8 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 3FB1C3A0586 for ; Sun, 28 May 2023 11:14:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2023 11:13:57 +0200 Message-Id: <20230528091416.17927-5-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 05/24] fftools/ffmpeg_filter: store just the link label in 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: urfNBtrpx+Jj Not the entire AVFilterInOut. This is simpler. --- fftools/ffmpeg.h | 6 ++++-- fftools/ffmpeg_filter.c | 8 +++++--- fftools/ffmpeg_mux_init.c | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 1bb9125bf2..3aa19c7f5f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -289,8 +289,10 @@ typedef struct OutputFilter { struct FilterGraph *graph; uint8_t *name; - /* temporary storage until stream maps are processed */ - AVFilterInOut *out_tmp; + /* for filters that are not yet bound to an output stream, + * this stores the output linklabel, if any */ + uint8_t *linklabel; + enum AVMediaType type; /* desired output stream properties */ diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 75317139ba..323e63b829 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -324,7 +324,7 @@ void fg_free(FilterGraph **pfg) for (int j = 0; j < fg->nb_outputs; j++) { OutputFilter *ofilter = fg->outputs[j]; - avfilter_inout_free(&ofilter->out_tmp); + av_freep(&ofilter->linklabel); av_freep(&ofilter->name); av_channel_layout_uninit(&ofilter->ch_layout); av_freep(&fg->outputs[j]); @@ -661,16 +661,18 @@ int init_complex_filtergraph(FilterGraph *fg) for (cur = outputs; cur;) { OutputFilter *const ofilter = ofilter_alloc(fg); - ofilter->out_tmp = cur; + ofilter->linklabel = cur->name; + cur->name = NULL; + ofilter->type = avfilter_pad_get_type(cur->filter_ctx->output_pads, cur->pad_idx); ofilter->name = describe_filter_link(fg, cur, 0); cur = cur->next; - ofilter->out_tmp->next = NULL; } fail: avfilter_inout_free(&inputs); + avfilter_inout_free(&outputs); avfilter_graph_free(&graph); return ret; } diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 1c97804ec8..f7a24feec7 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1260,7 +1260,7 @@ static OutputStream *ost_add(Muxer *mux, const OptionsContext *o, if (ofilter) { ost->filter = ofilter; ofilter->ost = ost; - avfilter_inout_free(&ofilter->out_tmp); + av_freep(&ofilter->linklabel); } else { ret = init_simple_filtergraph(ost->ist, ost, filters); if (ret < 0) { @@ -1451,8 +1451,8 @@ static void map_manual(Muxer *mux, const OptionsContext *o, const StreamMap *map for (j = 0; j < nb_filtergraphs; j++) { fg = filtergraphs[j]; for (k = 0; k < fg->nb_outputs; k++) { - AVFilterInOut *out = fg->outputs[k]->out_tmp; - if (out && !strcmp(out->name, map->linklabel)) { + const char *linklabel = fg->outputs[k]->linklabel; + if (linklabel && !strcmp(linklabel, map->linklabel)) { ofilter = fg->outputs[k]; goto loop_end; } @@ -1562,7 +1562,7 @@ static void create_streams(Muxer *mux, const OptionsContext *o) for (int j = 0; j < fg->nb_outputs; j++) { OutputFilter *ofilter = fg->outputs[j]; - if (!ofilter->out_tmp || ofilter->out_tmp->name) + if (ofilter->linklabel || ofilter->ost) continue; switch (ofilter->type) {