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 71A364E84B
for <ffmpegdev@gitmailbox.com>; Thu, 8 May 2025 01:39:10 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 857BF68C285;
Thu, 8 May 2025 04:38:33 +0300 (EEST)
Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com
[209.85.215.176])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53AC068C10A
for <ffmpeg-devel@ffmpeg.org>; Thu, 8 May 2025 04:37:54 +0300 (EEST)
Received: by mail-pg1-f176.google.com with SMTP id
41be03b00d2f7-b1fd59851baso258290a12.0
for <ffmpeg-devel@ffmpeg.org>; Wed, 07 May 2025 18:37:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746668272; x=1747273072; 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=TDtOWspbEp12Jaw4ljD99RxIjjTH2FiQxOsUNYp0ags=;
b=Zcr9v2gN8DdXjOAIywdp0Lygf7v5OymT5qbcjFGJtbbWpL1K1guHcNkQUTvat0iNr9
628bVS/wbCC6OAS3j+lp//NJ8vD6ri246FftSvCIrA79K4ULx6mPll9cQi1/jAh2in9w
/SNCer05YEy1wn7xSXX4OnyJe9n7vymtqigCeuY3+ydccioXd/3KEubYDr18D81GEpuq
noGGAAsQH2vGQk2TXxhE3zRnII9L098VFZ+o0YObTWFivSfsCc7K/7Q43b/jAOvn0TZt
VdUciO8yxnClKJXfk+UzEN6l/DXfDPgJtNu2pbKMVGskaDAHAURKnqB4ifY1w+a9d9Pi
IUOw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746668272; x=1747273072;
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=TDtOWspbEp12Jaw4ljD99RxIjjTH2FiQxOsUNYp0ags=;
b=Pmr5za4WlA9O0P5EfZnJIIrFZP5+SJFJsctfvs9xQByKtJkEBSYIKJo0nyAOoJ+XUn
/2OKs3ZGry98nGMnqq62bfmqGrEdXf5MNEQlq7fsbS2+nwbfZXVFCaM4R2hJHh8cEL87
1rG/G4DCaebjbfaK5/uEaRKjbeHCTg8Cbp2UYSeqOGIviljpnYp32GsP9Fg0bH/4LXpt
k55UY6r37wESAurcWTWSuTZ2ermYrsL8uUo9I3LF7g4Z2UYqF2ifv2mG5QdMPDIH2UHl
tEOIXJrUf6MM+dN8UOyX4pes+5pK5JXIi0i/yLn88vAwhjTEf7vNXMWUv32wQDx5iOTX
jKIA==
X-Gm-Message-State: AOJu0YyfIzv4SAHE+f0Z/cFuB5UkoTMrxKzbbm19wkcjyX+ywxhqdZrl
R9rwsf93iaR9BKJxoGnvbbZdZjXQW34WQgH64762YEb5wVSzBj6nQYjLsw==
X-Gm-Gg: ASbGnct2bCyWJkB7FVgejP8AI0Csye3T9XqB31gV1XSBKhGHdGHIk9PPVhRDfavBJIY
e5GFHl4eU62WlmyUK/6q0xv/s85Q8n5KdOphYZOCQtN0SCM4wA/kogmc+HYZ88kzCmBeU/p3ocx
NfD2ha+2S9Vbjt/h7XrBqZONMWZ5hA2GkOigd76NShEHiFO3dChvs67Drv61InxKhd3wG11is1r
Gzez3IeO4byMEZbwVqH39Pr9jACymazuwzhQM9pl4SR2tCQtZNmFgMmewNn48urnGeu1uToqg8b
fqbVzti5RtYX999aks9DuiJGVS2mWkUwK5qLf0AcTGMS6WwqpbkRvHDWwqs=
X-Google-Smtp-Source: AGHT+IETvh4RnPtoZDemplS4bzlkH//jC2Ya+O3pAk35nIBX/MuJZ+TVUK4WMDAW9jCLlbmlAKmbHg==
X-Received: by 2002:a17:90b:3908:b0:305:2d27:7cb0 with SMTP id
98e67ed59e1d1-30aac1b6a2bmr7922815a91.21.1746668272484;
Wed, 07 May 2025 18:37:52 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-30ad4f57fe7sm939490a91.32.2025.05.07.18.37.52
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 07 May 2025 18:37:52 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <4d4748bb4c6f9a238e78704bfc0ab7eca1430e6e.1746668216.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v12.ffstaging.FFmpeg.1746668216.ffmpegagent@gmail.com>
References: <pull.66.v11.ffstaging.FFmpeg.1746398104.ffmpegagent@gmail.com>
<pull.66.v12.ffstaging.FFmpeg.1746668216.ffmpegagent@gmail.com>
Date: Thu, 08 May 2025 01:36:50 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v12 09/15] fftools/textformat: Add flags
param to function avtext_print_integer()
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/4d4748bb4c6f9a238e78704bfc0ab7eca1430e6e.1746668216.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
Make this function work analog to avtext_print_string() which already
has a flags parameter.
Signed-off-by: softworkz <softworkz@hotmail.com>
---
fftools/ffprobe.c | 2 +-
fftools/textformat/avtextformat.c | 24 ++++++++++++++++++------
fftools/textformat/avtextformat.h | 2 +-
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index cb8b5e17f9..eb55083a1e 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -420,7 +420,7 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl)
avtext_print_string(tfc, k, pbuf.str, 0); \
} while (0)
-#define print_int(k, v) avtext_print_integer(tfc, k, v)
+#define print_int(k, v) avtext_print_integer(tfc, k, v, 0)
#define print_q(k, v, s) avtext_print_rational(tfc, k, v, s)
#define print_str(k, v) avtext_print_string(tfc, k, v, 0)
#define print_str_opt(k, v) avtext_print_string(tfc, k, v, AV_TEXTFORMAT_PRINT_STRING_OPTIONAL)
diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c
index dd595f15ba..7c73089bfd 100644
--- a/fftools/textformat/avtextformat.c
+++ b/fftools/textformat/avtextformat.c
@@ -289,10 +289,20 @@ void avtext_print_section_footer(AVTextFormatContext *tctx)
tctx->level--;
}
-void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t val)
+void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t val, int flags)
{
const AVTextFormatSection *section;
+ av_assert0(tctx);
+
+ if (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_NEVER)
+ return;
+
+ if (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_AUTO
+ && (flags & AV_TEXTFORMAT_PRINT_STRING_OPTIONAL)
+ && !(tctx->formatter->flags & AV_TEXTFORMAT_FLAG_SUPPORTS_OPTIONAL_FIELDS))
+ return;
+
av_assert0(key && tctx->level >= 0 && tctx->level < SECTION_MAX_NB_LEVELS);
section = tctx->section[tctx->level];
@@ -444,10 +454,12 @@ int avtext_print_string(AVTextFormatContext *tctx, const char *key, const char *
section = tctx->section[tctx->level];
- if (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_NEVER ||
- (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_AUTO
- && (flags & AV_TEXTFORMAT_PRINT_STRING_OPTIONAL)
- && !(tctx->formatter->flags & AV_TEXTFORMAT_FLAG_SUPPORTS_OPTIONAL_FIELDS)))
+ if (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_NEVER)
+ return 0;
+
+ if (tctx->show_optional_fields == SHOW_OPTIONAL_FIELDS_AUTO
+ && (flags & AV_TEXTFORMAT_PRINT_STRING_OPTIONAL)
+ && !(tctx->formatter->flags & AV_TEXTFORMAT_FLAG_SUPPORTS_OPTIONAL_FIELDS))
return 0;
if (section->show_all_entries || av_dict_get(section->entries_to_show, key, NULL, 0)) {
@@ -503,7 +515,7 @@ void avtext_print_ts(AVTextFormatContext *tctx, const char *key, int64_t ts, int
if ((!is_duration && ts == AV_NOPTS_VALUE) || (is_duration && ts == 0))
avtext_print_string(tctx, key, "N/A", AV_TEXTFORMAT_PRINT_STRING_OPTIONAL);
else
- avtext_print_integer(tctx, key, ts);
+ avtext_print_integer(tctx, key, ts, 0);
}
void avtext_print_data(AVTextFormatContext *tctx, const char *key,
diff --git a/fftools/textformat/avtextformat.h b/fftools/textformat/avtextformat.h
index 87f57d8c24..8f406de322 100644
--- a/fftools/textformat/avtextformat.h
+++ b/fftools/textformat/avtextformat.h
@@ -138,7 +138,7 @@ void avtext_print_section_header(AVTextFormatContext *tctx, const void *data, in
void avtext_print_section_footer(AVTextFormatContext *tctx);
-void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t val);
+void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t val, int flags);
int avtext_print_string(AVTextFormatContext *tctx, const char *key, const char *val, int flags);
--
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".