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 D3F134E199
for <ffmpegdev@gitmailbox.com>; Tue, 29 Apr 2025 01:02:26 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA5E668B643;
Tue, 29 Apr 2025 04:01:13 +0300 (EEST)
Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com
[209.85.216.54])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9D3B68B349
for <ffmpeg-devel@ffmpeg.org>; Tue, 29 Apr 2025 04:01:02 +0300 (EEST)
Received: by mail-pj1-f54.google.com with SMTP id
98e67ed59e1d1-301918a4e1bso4521654a91.1
for <ffmpeg-devel@ffmpeg.org>; Mon, 28 Apr 2025 18:01:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745888461; x=1746493261; 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=WvXPrzt8PSNqxLdQ3SpO+LrpslrPHmFwpusVbiKR7II=;
b=C1RIFN3m5CrbTbtd+o6btTRw+6uBJq5geDh/UNW+nRuvJsdJwD0ClSGCnGsfvVeam+
udz0VWNiSmSnTjzefAgq+hH4eTfBk22CBWREnYx1PE5h3hIm4NlKg7xpClXQBzBmpEm2
iHIohxt3LzJzpqcw/ph62YX9yCiLwp30vvtrH5NI5SzKtmHa2GeMoOQGkB0ybjzlYbRs
aBOSIu0ZXF396pEQB14doufmNWKj1r0as3ZC6Nqkygyf5C5ht2JAlXIYbzH+fXs55pv9
ZKlV0lGYN7JvDRNyQV0PZkuNKDEm8vCjxcfJrYQPAPMiFO1K71XSG6fU0yevkfqa8cNF
Vg7A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745888461; x=1746493261;
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=WvXPrzt8PSNqxLdQ3SpO+LrpslrPHmFwpusVbiKR7II=;
b=QNaPbFZ4fwdcbp+Kw1xG0IOkvnc4juTfvftv/Nh9q9qOzCu5MZvbxcrWt5GE/Coway
6TIZYh7ZxTZ61Wz45zr6AaZIGs0LnHysMWNeYbfcUFMsOinUuHPsH5BMcGCElekbdlXY
1k4MI2sgtZ1gCbQTwAjuKPnB93S4VpFHiOI20AjqfqJmap63ooyfGHl6AVYMVm12fRyT
9tccB+Qd+s/uLvxqoEiiy+LJUgwUqAS6ow4WcBJUmKHBSgVdCjtKypjrfAQHld0IJcI7
8ZmZaSFBE58hxDivqTDfnURulTzj1cZEb3vDIteB+zt6KbF2LGLrEoIbA3COGdm9GPdk
9RAw==
X-Gm-Message-State: AOJu0YxB5DFx/roGULC4bbC6H/HNcuAcrc9DFer9By78tzzvMyQdNfbA
y6JxxrRwD6CDR+taL6A5zjzE8WPuQfDjvKhBN9t+xoO5R/rjcnutc99G3A==
X-Gm-Gg: ASbGncvUYfqYiPz9/b1YR/A447vi6bsfDoMP7uZ8qO9qWjAAGHi2W5DYFPX6P+lKXGx
ECQyyPw26+Bz37RA7kdrJYBlK1wUCvtiUpMtZa+spPVQdYZWCmrfYuzD+bgzhGU4WId8NOg30Wr
FQBcnco6gjCSZWMo2ojY2m/cmP6WdkMJrqK2+bMxIu/sQ0A4Qag5aMh1LajNDV//4H48Kj4t7h9
+4CiEhqFjz7dTeHNRxoFOYxYY6UjnbWrdA5Lr1My+FswVFCb/QwbSCR62CI2zekWiF/ChgiHCfo
clvUUKlxDVIV0WbB4LTG7rLoNDk5Zh06owGboaio86yC9rwg2LQnJz5EbUY=
X-Google-Smtp-Source: AGHT+IFqs6c3TWihKudePPybhhBuktV1fZgmTueK6ni8yvdjfLqDDcRV7MlWUVa/lMBoBpufih1nZQ==
X-Received: by 2002:a17:90b:3912:b0:2ee:cded:9ac7 with SMTP id
98e67ed59e1d1-30a2155c323mr2469517a91.20.1745888460735;
Mon, 28 Apr 2025 18:01:00 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22db50e7a6csm89918215ad.151.2025.04.28.18.01.00
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Mon, 28 Apr 2025 18:01:00 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <a18ccba001740c1738c28b1d9b1ba377953faeeb.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:58 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v8 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/a18ccba001740c1738c28b1d9b1ba377953faeeb.1745888404.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 1277b1e4f9..444810cf43 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -422,7 +422,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 91469ef576..5b0f92d5cb 100644
--- a/fftools/textformat/avtextformat.c
+++ b/fftools/textformat/avtextformat.c
@@ -290,10 +290,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];
@@ -445,10 +455,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)) {
@@ -504,7 +516,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".