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 887E54DB13
for <ffmpegdev@gitmailbox.com>; Tue, 22 Apr 2025 21:56:54 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD87A68A5B8;
Wed, 23 Apr 2025 00:56:31 +0300 (EEST)
Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com
[209.85.214.169])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5065689969
for <ffmpeg-devel@ffmpeg.org>; Wed, 23 Apr 2025 00:56:13 +0300 (EEST)
Received: by mail-pl1-f169.google.com with SMTP id
d9443c01a7336-22c33e5013aso66301625ad.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 22 Apr 2025 14:56:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745358972; x=1745963772; 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=eHh4WrRhuk8LxtHnDE34/mNtmKrmP8sGQ1wYSyI/Ll4=;
b=NOA4zg2Hh5aUCHIM5q2PB6OswnoKzls84urivFX3l1HU/lTu1ckBqV5UeWULJRfYsR
4Z5cSZ6a+HNliWEjyMTfMujTe1JJa/ytzyxLlFncEkHNnU5IdAQ6JN6BQmyvo9Oghiz2
8Hd1hbThZbLrkg7YbgDAJrJgeGghroDOP3fIGthLQiekFVd8dM1PsNv5BKK+dQsijcot
Kew2Sc4PxaOrRQoQKg1mGz0hd/B9xerYfEBHyKlJFJTx/bPSKHyvCO3VOftAL5t4U3Xe
inJr0ws2AFcwhASbwQjI07X8VVyXzrLO0FiOgnZ1mVUSa6YhTsyTl7iz3O8bKzt3Bk7O
afqQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745358972; x=1745963772;
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=eHh4WrRhuk8LxtHnDE34/mNtmKrmP8sGQ1wYSyI/Ll4=;
b=eSZM0Ykap34xXLo1Rc+rfVXGH0uiViFtHSKWc0C9bk2tueB4hUWiO4qS4+B0F5gT1g
j0DV1UTucsc4FJrKeGJKXIhm4aR1Qsl/ybnxLWDeCm/vNs3LbF+iyR4D1noplRO9wUYE
ewMClqGKt698NgTYI0VpiMtQYrTw8lpBzxE8Y5woGW4a0I7jTz5nnsXDX8DBkMMasbob
ULTCzHIUBuEqNrxEHyqzbPNuYOeiIU/DGB+8mqTExPttSBNlVKH/+tvJmWFFg8lHgAMi
hH51FfpsFFDg1/7s1qgkWZs3oCIjz8g7DL6RkHGhmrgNsBeAHFY8Fi6EKYhlF7ybqdsm
ZTzA==
X-Gm-Message-State: AOJu0Yzc+wITFq7TqR209uZp0qQGnADroYvmvGfdtYGDGpaMP4+HcmV2
PJETn/pd9pAAhreyMHbwdy6nOU4q3AhQUXeaIr/AdfvNjF1RKK9ClSWspohL
X-Gm-Gg: ASbGnctRXVCDS/ed8pl7nHmpwum0jb3dfm7QwoPAn1NM4Rf31HO/K2syBn7+KdA3192
6yN3VYIEJqJ2Fk1xUdXZWpg4LN6v/qeJQGiMfMAtt6WoBYh8Q7iBJMYYEaBILsgilxs/w0y+7FR
gqqBJls5o7uoy3ZevqIJPDOBadfZ3tKjEgS75Sfl44hpKbIXjbaR2ZqSkEJQkajFb42e0pc5bQq
hWtvrOQ87BcRl/dBLvD/Ds88oknZ+ryfDG4AbTqNAJAbpF9uP5xCEdCZjWRUTV12j/sssL5+KFx
+LhPIUCwBXmteYQEFeZJOxtpttHpq5Pjnal1vzkHWD7chyWevJVk4pH0WNqc34LmgdUguA==
X-Google-Smtp-Source: AGHT+IGMvCI864Qn5qazgn8R//9YBIAy1K7Nwl46h1B86julSE2sRRwsmL0bn4vl6ZliYZd5AbBLWA==
X-Received: by 2002:a17:902:ce0e:b0:224:c46:d14b with SMTP id
d9443c01a7336-22c536647c4mr228913525ad.52.1745358971795;
Tue, 22 Apr 2025 14:56:11 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-309dfa0b2d6sm129266a91.19.2025.04.22.14.56.11
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Tue, 22 Apr 2025 14:56:11 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <26be409371cab3a946c6b28dcab1ac185a264e0c.1745358943.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v5.ffstaging.FFmpeg.1745358943.ffmpegagent@gmail.com>
References: <pull.66.v4.ffstaging.FFmpeg.1745189954.ffmpegagent@gmail.com>
<pull.66.v5.ffstaging.FFmpeg.1745358943.ffmpegagent@gmail.com>
Date: Tue, 22 Apr 2025 21:55:33 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v5 04/14] 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/26be409371cab3a946c6b28dcab1ac185a264e0c.1745358943.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().
Signed-off-by: softworkz <softworkz@hotmail.com>
---
fftools/ffprobe.c | 13 +++++++++----
fftools/textformat/avtextformat.c | 21 ++++++++-------------
fftools/textformat/avtextformat.h | 22 +++++++++++++++-------
3 files changed, 32 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 0a221f4a9a..217d9da25e 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;
@@ -155,11 +149,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);
@@ -202,7 +196,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;
@@ -213,6 +207,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 aea691f351..05a358132e 100644
--- a/fftools/textformat/avtextformat.h
+++ b/fftools/textformat/avtextformat.h
@@ -118,17 +118,25 @@ 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
+#define AV_TEXTFORMAT_OPEN_SHOW_VALUE_UNIT 1
+#define AV_TEXTFORMAT_OPEN_USE_VALUE_PREFIX 2
+#define AV_TEXTFORMAT_OPEN_USE_BYTE_BINARY_PREFIX 4
+#define AV_TEXTFORMAT_OPEN_USE_VALUE_SEXAGESIMAL_FORMAT 8
+#define AV_TEXTFORMAT_OPEN_SHOW_OPTIONAL_FIELDS 16
+
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".