From patchwork Fri Apr 5 16:12:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1071023pzd; Fri, 5 Apr 2024 09:16:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuebUfsiiKABVkTcghEJvUfwuCTIg9CmyUehP85hBEWX69Rg5y+dqeYt+PG0Jmewxgd14iC6aQ5iedjEkcPFJ7dU+d0KbylewCkQ== X-Google-Smtp-Source: AGHT+IHsd9W5gm0QFfGblDNufZ8A7jcY4SxI5DBIfr2yiv++ZhO8UI0RHziOhZdjxSQjlUObPVfe X-Received: by 2002:a19:ca4d:0:b0:513:c61c:7331 with SMTP id h13-20020a19ca4d000000b00513c61c7331mr1985177lfj.3.1712333785521; Fri, 05 Apr 2024 09:16:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712333785; cv=none; d=google.com; s=arc-20160816; b=VvAWtStL/F1aVOnEkpLY6MzyG3qdgmMTI4khMCHEs9c7CSLewn4Vr1ageSWlnuSWkj 4vTwfMgNBoK+2v7CoF87xtf5QDDqclK9XcfGilv6Iug3FIWfZdimU5k50xnYhFyYIhtk SZ5My7L1B4eNYV+9fLoXTprARD2wpSWIv20aow8gynMBozBST0p/jQbM/a4IuCtw9fXL ypM9KUMM2sX/1dnrNPaLlzjUw7uGSr/oWNkMXCAzbQwuLmikMP+HX+omOhzKghRe6a9n P2oM6TlBxsex3mI4oxSWSks386noH8CJKoiu8X+4TlMTkZ4fOYL6O/ATn34et3Rp7vTZ wzuw== 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=bES6GeQy4FREcMDNtjn4Sx8Zu20jV4QTeu2eKZtQ4GA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gG6pKLWLFBQKTNVLuD54Y3ACUfYeDFQJpX+TwsJUFqIaFO5KcYFx0W65L9W6Y5D9Al f9VbHsaXL/mCHiEPT80lLGyoH7pCZd8kB1KVwIQKW7CmuVEY9TzhMp8B1ZcmUHsxowGn UMgExKaBXsZ2kuPAGQpoYwIlO9t4S3BGewAII6/TPvhItnOJXYm0fjDM9ChQE/1/rTJB Dph7ctfWpv9iNqIdYe4LoxSvBTZy405/EZmkwi083EOQdGI9/324Ydd9JK8iRpwTZTuJ eFOaY1+FLFDcwgdS8LEuHB6RU0W0fz9UfxQlkM4lsmmzLNJNx78l1KSJEEYy4CD6+Iap Y2RA==; 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=I55dhm6n; 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 g11-20020a1709063b0b00b00a5188654596si823639ejf.743.2024.04.05.09.16.25; Fri, 05 Apr 2024 09:16:25 -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=I55dhm6n; 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 0691568D2D9; Fri, 5 Apr 2024 19:13:32 +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 72F7D68D15D for ; Fri, 5 Apr 2024 19:13:10 +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=I55dhm6n; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E3C7B4D86 for ; Fri, 5 Apr 2024 18:13:08 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id lAVG3g-32z11 for ; Fri, 5 Apr 2024 18:13:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1712333584; bh=9L2xsd6kBh9O0JLoDu4x12qhDVIcBDiKdDCWzjGD81Q=; h=From:To:Subject:Date:In-Reply-To:References:From; b=I55dhm6nR+awxymMl8H/VUWxHS4auhU3gv0kjnrvw96yRwectOFHNaPAurs2E4WZD 4n4WOnpZ9gY6RYbuJV6iiIQ61F6Qp4iFQewtVPAcSTSJw0QEj6nCJ0WEYtku6bEBXW WNFc87fhsNBjZxh98DnRkGMCTxRV3Bn4CfFcblgYoEd+RwaI2CGtLlq4nRJKEHBCcm yzMOdZWgBejWaZBIBwud4uczWtGiJiAdh/Zz1sFdMKR3rw3RXQ5iWjW8SMbiod4i/8 +IS4A5+mvVgAAu4WgDNvqZn5PDVW2sAOfa6P2EX2GvVve3VSOfRimMmuT3LRcfH0hV lffkSCJghBjmA== 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 998DD4D9C for ; Fri, 5 Apr 2024 18:13:03 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id B05373A1894 for ; Fri, 5 Apr 2024 18:12:56 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 18:12:08 +0200 Message-ID: <20240405161212.26167-27-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 27/31] fftools/ffmpeg_filter: only store complex filtergraphs in global array 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: 6DL/uT8W8xjF Store simple filtergraphs in the stream they feed. Keeping the two separate will be useful in following commits. --- fftools/ffmpeg.c | 5 +++++ fftools/ffmpeg.h | 3 +++ fftools/ffmpeg_filter.c | 16 +++++++++++++--- fftools/ffmpeg_mux.c | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0ee76d69b5..1f50ed6805 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -787,6 +787,11 @@ static int check_keyboard_interaction(int64_t cur_time) (n = sscanf(buf, "%63[^ ] %lf %255[^ ] %255[^\n]", target, &time, command, arg)) >= 3) { av_log(NULL, AV_LOG_DEBUG, "Processing command target:%s time:%f command:%s arg:%s", target, time, command, arg); + for (OutputStream *ost = ost_iter(NULL); ost; ost = ost_iter(ost)) { + if (ost->fg_simple) + fg_send_command(ost->fg_simple, time, target, command, arg, + key == 'C'); + } for (i = 0; i < nb_filtergraphs; i++) fg_send_command(filtergraphs[i], time, target, command, arg, key == 'C'); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6446a141b5..882d241bdb 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -582,6 +582,8 @@ typedef struct OutputStream { char *logfile_prefix; FILE *logfile; + // simple filtergraph feeding this stream, if any + FilterGraph *fg_simple; OutputFilter *filter; AVDictionary *encoder_opts; @@ -653,6 +655,7 @@ extern int nb_input_files; extern OutputFile **output_files; extern int nb_output_files; +// complex filtergraphs extern FilterGraph **filtergraphs; extern int nb_filtergraphs; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3988cf5fc2..388c8919fd 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1009,16 +1009,25 @@ int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch) AVFilterGraph *graph; int ret = 0; - fgp = allocate_array_elem(&filtergraphs, sizeof(*fgp), &nb_filtergraphs); + fgp = av_mallocz(sizeof(*fgp)); if (!fgp) return AVERROR(ENOMEM); fg = &fgp->fg; - if (pfg) + if (pfg) { *pfg = fg; + fg->index = -1; + } else { + ret = av_dynarray_add_nofree(&filtergraphs, &nb_filtergraphs, fgp); + if (ret < 0) { + av_freep(&fgp); + return ret; + } + + fg->index = nb_filtergraphs - 1; + } fg->class = &fg_class; - fg->index = nb_filtergraphs - 1; fgp->graph_desc = graph_desc; fgp->disable_conversions = !auto_conversion_filters; fgp->sch = sch; @@ -1135,6 +1144,7 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, ret = fg_create(&fg, graph_desc, sch); if (ret < 0) return ret; + ost->fg_simple = fg; fgp = fgp_from_fg(fg); fgp->is_simple = 1; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 2b7a733501..a1583edd61 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -797,6 +797,7 @@ static void ost_free(OutputStream **post) ms = ms_from_ost(ost); enc_free(&ost->enc); + fg_free(&ost->fg_simple); if (ost->logfile) { if (fclose(ost->logfile))