From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 5F80C4BCCC
for <ffmpegdev@gitmailbox.com>; Tue, 29 Apr 2025 01:01:48 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3192468B404;
Tue, 29 Apr 2025 04:00:56 +0300 (EEST)
Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com
[209.85.214.174])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 990BF687DC4
for <ffmpeg-devel@ffmpeg.org>; Tue, 29 Apr 2025 04:00:47 +0300 (EEST)
Received: by mail-pl1-f174.google.com with SMTP id
d9443c01a7336-2279915e06eso61487965ad.1
for <ffmpeg-devel@ffmpeg.org>; Mon, 28 Apr 2025 18:00:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745888446; x=1746493246; darn=ffmpeg.org;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:from:to:cc:subject:date
:message-id:reply-to;
bh=pxjhzbbUyvZsAW4Fyk124j5RDnHMWaIRnLwyzWW+03g=;
b=jIQWTglAIqqmFtl679rbspTxENrry5epopF1xmIO6uf7Z8yjLIQQNJpVGdgoy5ffHr
aVtvoSrF3qP/OAIuyATpep8M22lLvGGHSerR3nqotEt5XzV6Xmy1H6udM6rTwJvjXW3b
Jlnfu/tmZ21EWyfrnJxAkByH8xzRiC25gehHG2wuaNlHxSDWJmy+YOqY61Ng7Cu62OBh
m1ZlYk5E1bzdBt9shtvlrqEJoAjuGYqUKxuPReed7njkJ3RPh8tSKzFB26/uQ2pjfl1U
OrinWd5oFNyFGbLepff1x6LPvZoohiltcpPXAyz99yoLPGq18ItgFqv15jFW9YrrtN9T
zbWQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745888446; x=1746493246;
h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date
:references:in-reply-to:message-id:from:x-gm-message-state:from:to
:cc:subject:date:message-id:reply-to;
bh=pxjhzbbUyvZsAW4Fyk124j5RDnHMWaIRnLwyzWW+03g=;
b=Ap/pYwXIoxXuo2iPT7MzAEnRMddhPiNouyTYxX6fxDwoBY/bM7DIvtZTSV7S5x73HO
zNvnYONU6cqNlQhOVoW22Wb/zjT3vS88NxujmvEwthkI9jkQy385qgaEFj1R3zapCu1t
uQ59w+pVxf1lY8ZiCl+sH9gSwsE1wfSLZVe/ZdQK/qxhAI2hZWW2Ci0uLE2e8/eLTIPb
Ip3tGcInmtwyjrcjLYIZdmS1tFMbU3/JhSwQdiHeYr2KUcQqCpCo3cXWB4xCYjbucgIG
KsbqNTQH23AEy+bIRg4kr8aZOuMzJx/JhSCligSQvkZDiKceuDc34PvquV6w/2aEYtyc
5thg==
X-Gm-Message-State: AOJu0YxAe6mNFZFZTyMKx3Nj4qp/V2p7LyrMJwDLdbV2C56fObc64vZT
UBwMNmwDibH48oG5r1zNgzYyce0mLIbXGU6n89VmXy3c/N9iETop
X-Gm-Gg: ASbGncsOC1iCD0zP6NKFFEEGzAi0tspmLo9nizEQ+ir0useWr9fU+s4K5A9wvs/joLo
k2t/4JlUU0q+Fs2y+eJDGu3+K/ysGL+X1yAGKI0qsALkhqXCNEGDzl7Uludm3L1oy7vWRkdebju
W+95bgzk45YYjsQuSTp3+uuu9XlDLk+TPhhJ9oIG8nCL42R9mDMekniNoLcEEIBvxO0TJqLKhXV
X7s6mQDHGpwmKUMWtXQuUhcQ1+WzKG+IAdLqFsNqTe4vE0oke4e68KuRSDibdTjAxPZi3BOB12x
nR1H7DMFlqm7lQ==
X-Google-Smtp-Source: AGHT+IGSDhEkE1nTRk1lnKqsZgILQmliRk3NMAuFwTJWQBD2vkSd+RzT5f3J27TkE+AAHnlC4rBpDg==
X-Received: by 2002:a17:902:d501:b0:224:1eab:97b2 with SMTP id
d9443c01a7336-22dc6a8f2cbmr169289415ad.53.1745888443974;
Mon, 28 Apr 2025 18:00:43 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22db4d76ea8sm90079355ad.32.2025.04.28.18.00.43
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Mon, 28 Apr 2025 18:00:43 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <95ef1f09196afd4cb96407a72a92d25df9b781df.1745888404.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v8.ffstaging.FFmpeg.1745888404.ffmpegagent@gmail.com>
References: <pull.66.v7.ffstaging.FFmpeg.1745623868.ffmpegagent@gmail.com>
<pull.66.v8.ffstaging.FFmpeg.1745888404.ffmpegagent@gmail.com>
Date: Tue, 29 Apr 2025 00:59:55 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v8 06/15] fftools/textformat: Introduce
AVTextFormatOptions for avtext_context_open()
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: softworkz <softworkz@hotmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/95ef1f09196afd4cb96407a72a92d25df9b781df.1745888404.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
This allows future addition of options without
changes to the signature of avtext_context_open().
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
fftools/ffprobe.c | 13 +++++++++----
fftools/textformat/avtextformat.c | 21 ++++++++-------------
fftools/textformat/avtextformat.h | 16 +++++++++-------
3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index f5c83925b9..1277b1e4f9 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -3168,10 +3168,15 @@ int main(int argc, char **argv)
if (ret < 0)
goto end;
- if ((ret = avtext_context_open(&tctx, f, wctx, f_args,
- sections, FF_ARRAY_ELEMS(sections), show_value_unit,
- use_value_prefix, use_byte_value_binary_prefix, use_value_sexagesimal_format,
- show_optional_fields, show_data_hash)) >= 0) {
+ AVTextFormatOptions tf_options = {
+ .show_optional_fields = show_optional_fields,
+ .show_value_unit = show_value_unit,
+ .use_value_prefix = use_value_prefix,
+ .use_byte_value_binary_prefix = use_byte_value_binary_prefix,
+ .use_value_sexagesimal_format = use_value_sexagesimal_format,
+ };
+
+ if ((ret = avtext_context_open(&tctx, f, wctx, f_args, sections, FF_ARRAY_ELEMS(sections), tf_options, show_data_hash)) >= 0) {
if (f == &avtextformatter_xml)
tctx->string_validation_utf8_flags |= AV_UTF8_FLAG_EXCLUDE_XML_INVALID_CONTROL_CODES;
diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c
index b2c3aa3fc7..91469ef576 100644
--- a/fftools/textformat/avtextformat.c
+++ b/fftools/textformat/avtextformat.c
@@ -125,13 +125,7 @@ void avtext_context_close(AVTextFormatContext **ptctx)
int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *formatter, AVTextWriterContext *writer_context, const char *args,
- const AVTextFormatSection *sections, int nb_sections,
- int show_value_unit,
- int use_value_prefix,
- int use_byte_value_binary_prefix,
- int use_value_sexagesimal_format,
- int show_optional_fields,
- char *show_data_hash)
+ const AVTextFormatSection *sections, int nb_sections, AVTextFormatOptions options, char *show_data_hash)
{
AVTextFormatContext *tctx;
int i, ret = 0;
@@ -154,11 +148,11 @@ int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *form
goto fail;
}
- tctx->show_value_unit = show_value_unit;
- tctx->use_value_prefix = use_value_prefix;
- tctx->use_byte_value_binary_prefix = use_byte_value_binary_prefix;
- tctx->use_value_sexagesimal_format = use_value_sexagesimal_format;
- tctx->show_optional_fields = show_optional_fields;
+ tctx->show_value_unit = options.show_value_unit;
+ tctx->use_value_prefix = options.use_value_prefix;
+ tctx->use_byte_value_binary_prefix = options.use_byte_value_binary_prefix;
+ tctx->use_value_sexagesimal_format = options.use_value_sexagesimal_format;
+ tctx->show_optional_fields = options.show_optional_fields;
if (nb_sections > SECTION_MAX_NB_SECTIONS) {
av_log(tctx, AV_LOG_ERROR, "The number of section definitions (%d) is larger than the maximum allowed (%d)\n", nb_sections, SECTION_MAX_NB_SECTIONS);
@@ -201,7 +195,7 @@ int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *form
av_dict_free(&opts);
}
- if (show_data_hash)
+ if (show_data_hash) {
if ((ret = av_hash_alloc(&tctx->hash, show_data_hash)) < 0) {
if (ret == AVERROR(EINVAL)) {
const char *n;
@@ -212,6 +206,7 @@ int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *form
}
goto fail;
}
+ }
/* validate replace string */
{
diff --git a/fftools/textformat/avtextformat.h b/fftools/textformat/avtextformat.h
index 8ff503401a..87f57d8c24 100644
--- a/fftools/textformat/avtextformat.h
+++ b/fftools/textformat/avtextformat.h
@@ -117,17 +117,19 @@ struct AVTextFormatContext {
unsigned int string_validation_utf8_flags;
};
+typedef struct AVTextFormatOptions {
+ int show_optional_fields;
+ int show_value_unit;
+ int use_value_prefix;
+ int use_byte_value_binary_prefix;
+ int use_value_sexagesimal_format;
+} AVTextFormatOptions;
+
#define AV_TEXTFORMAT_PRINT_STRING_OPTIONAL 1
#define AV_TEXTFORMAT_PRINT_STRING_VALIDATE 2
int avtext_context_open(AVTextFormatContext **ptctx, const AVTextFormatter *formatter, AVTextWriterContext *writer_context, const char *args,
- const AVTextFormatSection *sections, int nb_sections,
- int show_value_unit,
- int use_value_prefix,
- int use_byte_value_binary_prefix,
- int use_value_sexagesimal_format,
- int show_optional_fields,
- char *show_data_hash);
+ const AVTextFormatSection *sections, int nb_sections, AVTextFormatOptions options, char *show_data_hash);
void avtext_context_close(AVTextFormatContext **tctx);
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".