From patchwork Sun Jan 7 21:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 45528 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2449:b0:199:85ec:e0df with SMTP id t9csp672843pzc; Sun, 7 Jan 2024 13:31:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmTrMFQRYE6lK9JUgpN07YxrW71v7CFuhZiRPqrksjYTNwYqVu61UmNu/4MhsV1AAnDc2s X-Received: by 2002:a17:906:298d:b0:a26:5d51:871 with SMTP id x13-20020a170906298d00b00a265d510871mr2317919eje.3.1704663094739; Sun, 07 Jan 2024 13:31:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704663094; cv=none; d=google.com; s=arc-20160816; b=dDOuEfEFq+sXACmjE2cYMN4ROrSUfcERvpbEtr2hO/mq0OhcNYhM1Bh4aOhVRhsykP lgl6pNI1jEPB7j/ZbvjRt18j64FuSKESVAht2dgtnoPWVzuMdyabepq/E9i9ChFHP5i0 wDpJWGdrwpI7EPHD2S/dIUw4OOjqK9M/xeqLfzfXQtPEAiNQpCHUstJXz0M3VIqEKWRN 92HbhpFzfZdxiykfNjtsy9hmPbLUwrGAhq6A8fJUahxit/8CsUiUDZuBez4u2nvpxAo6 BoBnV7O/UW5Cgwd10JQ7YKv4ozf3Un9vZpC68pKlr7mbeVIhrKIyZQ1stHS3fv1rA4B8 vJVQ== 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=bKLDfy0voYS6TRaNE0CZvr1miqTC/XCjvO2vnIPlhtg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qHrapMXVd4tZ2TvFjDHo4jk33ZPMh7jPhkqM7w04NGvxrVg0BoHvQzbbwApDvJd0mA TyMazRYJ0EalesXvY2+V8tbUf+QKTIuc024IHnNE6z2N7mGBhOADSEb3KLJqP2tWlTum swdZfn4dM1I1MM1mQKzJCKNpZEa8H2XOOFWVHNF0e2Hb+JgZfvB0KA2uYcDxyuPtv4lL Of+H5YUsQ6etTWsqcRDbWy8/h0c+tm8O0ICYVMVcUVbyjn5fEabXmkMTqBvBNW2UBkjU 0SgqAaNGQjmGuUw/NGuPpqjyWLkkky2qMFV2Wjzs42mTC4B81BeZK3Wp8yL2TUep8Dz8 M/zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JBt5Uqm2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gi16-20020a1709070c9000b00a2a2ad86b09si1123324ejc.157.2024.01.07.13.31.34; Sun, 07 Jan 2024 13:31:34 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=JBt5Uqm2; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15DD468CD84; Sun, 7 Jan 2024 23:31:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1528268CC4B for ; Sun, 7 Jan 2024 23:31:09 +0200 (EET) Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-3606f507efeso8219385ab.3 for ; Sun, 07 Jan 2024 13:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704663066; x=1705267866; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=n2/nWwmWyOBbBLUJm4Rk7FiXTtkfdIQhVPEehUz43zA=; b=JBt5Uqm2Ea7+otBsKUBnV5Ctt/vqZeVZkDjwOVEldCIaAvTlTPxFcnKdlg35+lEJlU qlZzK2wnULnerTi8KJxY7AqP+o4preBR8JUF/uhQifCK76LSRbFcqs3LzFHOZxrNPfKJ xo1OWm36ejMEG9xiFhsJoA1oF2/vmLFxuM6OX+SxJKL4Jm0tqpk3DSm0NWxe/0YL98xw EnNRbLT7YFgj7MTlGVdgLuMulHsu5cwBYtfBDAcYF51wo05tLAU8ze/lRT9IooecPfxQ vlNcrOhWzQGYwtA2NHCuo5oClo++D+B2A5MSToJbTal9xaRtz1wCuwdZ55qLuwcrUyYR WT4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704663066; x=1705267866; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n2/nWwmWyOBbBLUJm4Rk7FiXTtkfdIQhVPEehUz43zA=; b=G9Lf0q4FmLok0szV6wAHprJYdzRObukGhpfVNarSo42W7o2HziuXhUzVw21H4rAMHl /nVd0XJRqLAeu1ZsTHH8DkgsTid0JBW+Q4q3PEniL1hUYBV3n02v0QIvAkkv3urxIH9K 8bYuP92NS8NSgLsJY5P6BxJY8d1XNuzukPTh7Shn9/R8VUGuEKq93x3aimdaE/QXLbpN sxPA78V3d0E0o9tytOTcU/DO+kCbOOyOjCEUmq6RG3kGdiDR+QsFAb/mUuegx9vDgroz wH2jrf2+NTUEVHq6HONoCFy4q7RWOHX3PFZmWHU+NcD4vMGRwKAaTmDfkjxIaEO1DYlZ nnJQ== X-Gm-Message-State: AOJu0YzBfwZYobXpc/B0PNGrXQ4WH7M4lDiPYQ5l98WTkzd4WaAPAUrX FufS6+IWBIgzejxfDmKh/yBlM175OHY= X-Received: by 2002:a05:6e02:174c:b0:35f:f394:f79a with SMTP id y12-20020a056e02174c00b0035ff394f79amr5679021ill.36.1704663066673; Sun, 07 Jan 2024 13:31:06 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a21-20020a1709027d9500b001d403969bf4sm4805939plm.309.2024.01.07.13.31.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 13:31:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jan 2024 18:30:59 -0300 Message-ID: <20240107213100.16205-3-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240107213100.16205-1-jamrial@gmail.com> References: <20240107213100.16205-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg_opt: add a stream_group_script option 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: lOHNATVTI2V9 Similar to filter_complex_script. Should make setting stream groups easier. Signed-off-by: James Almer --- fftools/ffmpeg_mux_init.c | 2 +- fftools/ffmpeg_opt.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 80109df0ae..1b42ac9a1d 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2301,7 +2301,7 @@ static int of_add_groups(Muxer *mux, const OptionsContext *o) char *str, *ptr = NULL; int ret = 0; - str = av_strdup(o->stream_groups.opt[i].u.str); + str = av_strireplace(o->stream_groups.opt[i].u.str, "\n", ""); if (!str) return ret; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 7ae1b55cf0..7347fcbd31 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1508,6 +1508,9 @@ const OptionDef options[] = { { "stream_group", OPT_TYPE_STRING, OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(stream_groups) }, "add stream group with specified streams and group type-specific arguments", "id=number:st=number..." }, + { "stream_group_script", OPT_TYPE_FILE, OPT_SPEC | OPT_OUTPUT, + { .off = OFFSET(stream_groups) }, + "read stream group with specified streams and group type-specific arguments from a file", "filename" }, { "dframes", OPT_TYPE_FUNC, OPT_FUNC_ARG | OPT_PERFILE | OPT_EXPERT | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_data_frames }, "set the number of data frames to output", "number",