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 6F4EF4DEA6
for <ffmpegdev@gitmailbox.com>; Fri, 25 Apr 2025 23:32:16 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA01668B153;
Sat, 26 Apr 2025 02:31:44 +0300 (EEST)
Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com
[209.85.214.176])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1173368A0C3
for <ffmpeg-devel@ffmpeg.org>; Sat, 26 Apr 2025 02:31:39 +0300 (EEST)
Received: by mail-pl1-f176.google.com with SMTP id
d9443c01a7336-22928d629faso31721095ad.3
for <ffmpeg-devel@ffmpeg.org>; Fri, 25 Apr 2025 16:31:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745623897; x=1746228697; 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=cw7OLDHut0mFjGX4h6khBfYTkxTLXqhqxA3f6BGyYiU=;
b=P+03GwIt+s/jbO1U6r9hscNKLeu0lN4Ota8fPZn+/xuiNm2a1k4mkfBwJyULIt+QKY
RWMH9S4hLVQP3KRA837oAEozLZJomfkpRcpj3CP+g/t2rFmdA2AjCdZoWRt/8GEg9XE2
dj5DkloSVCcfEq4G/7/5t4McnTlOh7MAlldTa8XqvQVcwyAILMElsbMqGdgUXpNqqIPA
/vGW/znvefKeOVRd45gpVf/ERSVd1T22igcnM2GpcO46wbahyygFdbjFB/NC+1cy/9Ee
8BVXggh3iqO2zOAtQpI8fPEw6nakxtvykuwn7KiPq+unYe83UurGcm2+zzR/BoGj1ymn
4vCg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745623897; x=1746228697;
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=cw7OLDHut0mFjGX4h6khBfYTkxTLXqhqxA3f6BGyYiU=;
b=blbIO+HuCkCG7YYh8G6YRENretfDXTX9zVTIUNrKS53/HuP2E0IGpQWjvSJvl5N9iE
gy7LO4mFLKCPjNbA0IlunY747jVV94uvI9s+g2iz4iY9zRRy3TXcE6OuQg7WRkxKNnBL
q78FjM6QKy764MSx1Ay8yU9itJQmMS2bmSalJ1i8OgXDUY+kf+NfbvIxGNwIe8YGXRSi
Ry11Z88xcI1JPwk3EUDNmUcTXE8pVAVe+yxSrMLyeaTjN33qvPmPbjqq2211kfc9Ul37
dRfKyQuTDUpardkg6gvT7AZH0M4JtfV6AEM60ipQTu7CMl0W2rP9PBwFO5vv4cM09EM0
EFfA==
X-Gm-Message-State: AOJu0Yz7S87EpKYKF7sG7BWdRetZow0hRuWq1VLZtVzPW19EAJCrVzGl
QLmlqgCyNWnkNYcuqIC71XAPYljLM23ISgoEBj0VZ1SaP0w73bTtY7ncEQ==
X-Gm-Gg: ASbGncsNiz7MnnMv+Ozk/cET0hwEMmB0q00bHX9wL2IzevJ6/Ri3YlVJWxRgmlnmmVm
1sLx7cZEl3Hc5hnM/TLeOJHo3UDi6yhBJZm+RLDVr9mKMioBvf8of/PPiUkAj4R5pjgGXjcG/9v
YIF5ibtdExDnjwxymkNARyQCI116yR9rZYGdjukvygb1q3ot7096xLWm01RGKW0GeNgwVkhlKPn
+u9tMMK05LWzH3BWnCtF1q9s3210IyStmCDOC2k/hi1RbXoMYhoLPixfOK3d00DLX/T174elGzV
4RifYgOlJgda6I0z+zrXA1122nOLKBdUlAcknd6IIh5dfr9thu5SOaSbuXk=
X-Google-Smtp-Source: AGHT+IEHyvGt93rEDK6CSSLDZtcmHfQX59B0TNJxwQDgsfQgf79wWvTHvZxnkALGMMrcSRlboWgr5g==
X-Received: by 2002:a17:902:d512:b0:21f:4649:fd49 with SMTP id
d9443c01a7336-22dbf740413mr58681315ad.49.1745623897347;
Fri, 25 Apr 2025 16:31:37 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22db4d76e0bsm38686985ad.43.2025.04.25.16.31.37
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Fri, 25 Apr 2025 16:31:37 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <97ab9e0426cc92c80c413dbf2c342b68b9e9730d.1745623868.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v7.ffstaging.FFmpeg.1745623868.ffmpegagent@gmail.com>
References: <pull.66.v6.ffstaging.FFmpeg.1745457192.ffmpegagent@gmail.com>
<pull.66.v7.ffstaging.FFmpeg.1745623868.ffmpegagent@gmail.com>
Date: Fri, 25 Apr 2025 23:30:59 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v7 04/13] 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/97ab9e0426cc92c80c413dbf2c342b68b9e9730d.1745623868.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 5ba427d6f2..b8e283d00c 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..071149c5be 100644
--- a/fftools/textformat/avtextformat.h
+++ b/fftools/textformat/avtextformat.h
@@ -118,17 +118,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".