From patchwork Thu Apr 27 14:25:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41378 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp564599pzb; Thu, 27 Apr 2023 07:29:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7DtMOJE8x6nmQCJ62DslkUAsAzIv+E3sx5XHvAA6yOisymtsmMPiJMw1E0KKGy9VLzICQk X-Received: by 2002:aa7:dbd2:0:b0:50a:16ab:340e with SMTP id v18-20020aa7dbd2000000b0050a16ab340emr1856841edt.29.1682605740574; Thu, 27 Apr 2023 07:29:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682605740; cv=none; d=google.com; s=arc-20160816; b=uCZb8N40XktDTNUEdVAS6IWpvwzM+TXgxEcSzVSxmi/c2zFo/azhZrhKhMksRibaMQ yCPNmjjiRrGx9BFZ+rcv7Oj3TEZVr3yGpWqTCDUUVDdpv5Gcf8dHytN4uwLZngShKp/v kgPuLsGPoR/kZrtym0/5eRjpfY4bXVaatlE0kv9fYxfjKQJ1DTDQuutb2jtCyjxmZkiK iEa42Uw9nUqrZSP4A8rubGsIzNdBEVln64Z1x3fFTZARRfcQ/SthjA7C/lLceoFbz8xV VZ1bghybYuiwQKXEywnwGRc8a5bJMk66tXaBLQeWFX3Wbva5U0KYEe7W47iYa9vLtAWq 3iGg== 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=Y3r+fgxvT1oKhFCFDKJPKn1O+v3tfYet5MLb5viINWk=; b=oCIqTmglvgzaDxlLUW2BjBTEr467tuiRJlrYdiaWDIM6WdJFbTbyxvdrszZtPifniE xJsF8Tpv0nDFVdRXI79exerByOy+sM0NdQs5zAg16zOBLp7+DAzPne1LW6aQ8zcOM6Dk CxgKwKVwt/R1uJJzLacMsOzPDMtypeGyuK9MNNnH1rw5yAki820wsivIs89h1UjL7y// DTUc6PZBHJLkAeLPH8fYQl0+K+yzyJbx/3QAAYrllqTsdvRdSwB4Y3Edw8JvNPM4Lu/m lss9fl+yWgLY+pNZ4nUV7pkYt18D0ge955nkKUvqfZnVWgzVXX7XC3WYZoG4DIUoy/6A MUEA== 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 d9-20020a05640208c900b004fb076448e4si15234205edz.163.2023.04.27.07.28.59; Thu, 27 Apr 2023 07:29:00 -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 8B07268C02C; Thu, 27 Apr 2023 17:26:34 +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 3496068BF92 for ; Thu, 27 Apr 2023 17:26:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2045C2406CB for ; Thu, 27 Apr 2023 16:26:10 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 5D6NULRiqWQP for ; Thu, 27 Apr 2023 16:26:09 +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 6D1362406CA for ; Thu, 27 Apr 2023 16:26:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5FA613A03E5 for ; Thu, 27 Apr 2023 16:26:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Apr 2023 16:25:49 +0200 Message-Id: <20230427142601.2613-9-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230427142601.2613-1-anton@khirnov.net> References: <20230427142601.2613-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/21] fftools/ffmpeg_filter: make graph_desc private 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: nKITXbOaLceu It is not used outside of ffmpeg_filter. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 2acbccfe2c..e0e923e902 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -323,7 +323,6 @@ typedef struct OutputFilter { typedef struct FilterGraph { int index; - const char *graph_desc; AVFilterGraph *graph; // true when the filtergraph contains only meta filters diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 4b7b34b05d..12ecf54998 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -41,6 +41,8 @@ typedef struct FilterGraphPriv { FilterGraph fg; + const char *graph_desc; + // frame for temporarily holding output from the filtergraph AVFrame *frame; } FilterGraphPriv; @@ -242,7 +244,7 @@ void fg_free(FilterGraph **pfg) av_freep(&fg->outputs[j]); } av_freep(&fg->outputs); - av_freep(&fg->graph_desc); + av_freep(&fgp->graph_desc); av_frame_free(&fgp->frame); @@ -255,7 +257,7 @@ FilterGraph *fg_create(char *graph_desc) FilterGraph *fg = &fgp->fg; fg->index = nb_filtergraphs - 1; - fg->graph_desc = graph_desc; + fgp->graph_desc = graph_desc; fgp->frame = av_frame_alloc(); if (!fgp->frame) @@ -312,6 +314,7 @@ static char *describe_filter_link(FilterGraph *fg, AVFilterInOut *inout, int in) static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) { + FilterGraphPriv *fgp = fgp_from_fg(fg); InputStream *ist = NULL; enum AVMediaType type = avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx); InputFilter *ifilter; @@ -332,7 +335,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) if (file_idx < 0 || file_idx >= nb_input_files) { av_log(NULL, AV_LOG_FATAL, "Invalid file index %d in filtergraph description %s.\n", - file_idx, fg->graph_desc); + file_idx, fgp->graph_desc); exit_program(1); } s = input_files[file_idx]->ctx; @@ -350,13 +353,13 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) } if (!st) { av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " - "matches no streams.\n", p, fg->graph_desc); + "matches no streams.\n", p, fgp->graph_desc); exit_program(1); } ist = input_files[file_idx]->streams[st->index]; if (ist->user_set_discard == AVDISCARD_ALL) { av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " - "matches a disabled input stream.\n", p, fg->graph_desc); + "matches a disabled input stream.\n", p, fgp->graph_desc); exit_program(1); } } else { @@ -560,6 +563,7 @@ fail: int init_complex_filtergraph(FilterGraph *fg) { + FilterGraphPriv *fgp = fgp_from_fg(fg); AVFilterInOut *inputs, *outputs, *cur; AVFilterGraph *graph; int ret = 0; @@ -571,7 +575,7 @@ int init_complex_filtergraph(FilterGraph *fg) return AVERROR(ENOMEM); graph->nb_threads = 1; - ret = graph_parse(graph, fg->graph_desc, &inputs, &outputs, NULL); + ret = graph_parse(graph, fgp->graph_desc, &inputs, &outputs, NULL); if (ret < 0) goto fail; @@ -1179,11 +1183,12 @@ static int graph_is_meta(AVFilterGraph *graph) int configure_filtergraph(FilterGraph *fg) { + FilterGraphPriv *fgp = fgp_from_fg(fg); AVBufferRef *hw_device; AVFilterInOut *inputs, *outputs, *cur; int ret, i, simple = filtergraph_is_simple(fg); const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter : - fg->graph_desc; + fgp->graph_desc; cleanup_filtergraph(fg); if (!(fg->graph = avfilter_graph_alloc())) @@ -1363,7 +1368,8 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr int filtergraph_is_simple(FilterGraph *fg) { - return !fg->graph_desc; + FilterGraphPriv *fgp = fgp_from_fg(fg); + return !fgp->graph_desc; } int reap_filters(int flush)