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 988CA4B89D
for <ffmpegdev@gitmailbox.com>; Fri, 25 Apr 2025 23:32:53 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF1BD68B249;
Sat, 26 Apr 2025 02:31:57 +0300 (EEST)
Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com
[209.85.214.172])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E7D068B118
for <ffmpeg-devel@ffmpeg.org>; Sat, 26 Apr 2025 02:31:55 +0300 (EEST)
Received: by mail-pl1-f172.google.com with SMTP id
d9443c01a7336-224100e9a5cso35028295ad.2
for <ffmpeg-devel@ffmpeg.org>; Fri, 25 Apr 2025 16:31:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745623914; x=1746228714; 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=Mv129smxW/1xtDbIiG1TkKil4QEeIcn+HijgtXuj2Y8=;
b=GW5p58Hyo4C14bN/45Ge1s4DPipXGnk5cL9xETkmTJtIqskKBrYkRTXEzCb2TOBmlh
+riK2oU7eCSDtKtGDO1r5i46bdI7/scNRAU6cZ10z66XurIIB5za3xuKjUsApY1xumoT
Lbusi/SOZfAmf7qULL91lpCa0WEDWPHLNME2stBdxPmCBi9s7QXq+8wq/ussCClLW4jh
npjx7iwAtgt+gXax7VcbZYhdJeQG/xzNDZzaIo4PTFPkveQt1WxJtR5pnlwhnfHiZ1ew
P3dkxAlPh9nX1x6KjEqWJuv2A+gyCgvg5QfqnRrcxB8OaCXs3GcAFS4QHyOlJ1tuLgxb
ESNg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745623914; x=1746228714;
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=Mv129smxW/1xtDbIiG1TkKil4QEeIcn+HijgtXuj2Y8=;
b=ovfivFGjFH5d10IBsD5GIIn6xSE1Oc4Bujlryf22vSLp2m7CuB55qjOBFgidDbRiMY
TrBNYbFg/CvlEv3c4O66DAD0DmX9DOYYE9VmjnPROIBtYa3k66npqTLfR9hZ6zrw1Q6G
y0tVMuqiG5KPJ81yetgxus24E+a9SV/lWgqoFFL2+Tx4VqPknXnvOv1cFKjN2qc3XEjE
4x4DanjpG19dyjhCqvFY2uz2V8GVgD5ncJXD/gTE+nr+gvr5UwiiC/PyXY3RL0CqzbT0
K31+NAmABCDRchxsN0cvjAT23/PXTedE6hvdlngOQtDnOS4mB/BiNktgoFCf3aeNQ8u4
llXw==
X-Gm-Message-State: AOJu0YwsJlOqS2jahEK8ogaZbX88PXFnLa2vEzZ3+HNZiLnx6lDhiTxS
aOOwXORp7LoWFXrITihZ3DkKvXLtvuTfImMDjjXalFzhiZlAcSPPKKuFcw==
X-Gm-Gg: ASbGnctfIEjwgD2NfDnzio1VSv1SJGWCuW0cfIanSPYD/VJ3XKVaCLnFkqODXdvgaco
2OgaG1wqZDF1FOUDIwycq2mSAIrhGvhJ+WCclfSGZeXvCnTrvQR+VXOSWyZZhLks8dn5XOoG520
NfTbJSSySUWjvcoOr/L1LCT2/TLcJsfIlarhlmquWnELMIHMw3sU/VGN++5sYY2fDcT3Us9rlmu
cWph1CXEn4pQG+Wj63Z16OWeqRpG3DyHnwJX/KkjcAnQdy8PB1EjniK8kEnyeFS0jFeOpAx8Wrn
35iw3BGUTD3EeOMsbxHh0Jev8GTY5K0c1qwQ9/OMf736IXcXrH9fawpkRbAi3HL3sebpbw==
X-Google-Smtp-Source: AGHT+IHWdTwkHjL/RH2WW1+DeendR22iW8W4NFFcoELJnG89JoOt0WoywzqpA7GFIv2V0xKsMwoCaA==
X-Received: by 2002:a17:903:2445:b0:224:2715:bf44 with SMTP id
d9443c01a7336-22dbf5ede35mr63737435ad.19.1745623913778;
Fri, 25 Apr 2025 16:31:53 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22db5100809sm38519325ad.160.2025.04.25.16.31.53
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Fri, 25 Apr 2025 16:31:53 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <59dfd3ded633e1081e020f4ed99d851c5aecc79e.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:31:02 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v7 07/13] fftools/textformat: Add function
avtext_print_integer_flags()
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/59dfd3ded633e1081e020f4ed99d851c5aecc79e.1745623868.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
This function works analog to the avtext_print_string() which already
has a flags parameter.
Signed-off-by: softworkz <softworkz@hotmail.com>
---
fftools/textformat/avtextformat.c | 25 +++++++++++++++++++++----
fftools/textformat/avtextformat.h | 2 ++
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c
index b8e283d00c..86220dc676 100644
--- a/fftools/textformat/avtextformat.c
+++ b/fftools/textformat/avtextformat.c
@@ -301,6 +301,21 @@ void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t va
}
}
+void avtext_print_integer_flags(AVTextFormatContext *tctx, const char *key, int64_t val, int flags)
+{
+ 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;
+
+ avtext_print_integer(tctx, key, val);
+}
+
static inline int validate_string(AVTextFormatContext *tctx, char **dstp, const char *src)
{
const uint8_t *p, *endp, *srcp = (const uint8_t *)src;
@@ -442,10 +457,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)) {
diff --git a/fftools/textformat/avtextformat.h b/fftools/textformat/avtextformat.h
index 071149c5be..f4175c6f48 100644
--- a/fftools/textformat/avtextformat.h
+++ b/fftools/textformat/avtextformat.h
@@ -141,6 +141,8 @@ void avtext_print_section_footer(AVTextFormatContext *tctx);
void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t val);
+void avtext_print_integer_flags(AVTextFormatContext *tctx, const char *key, int64_t val, int flags);
+
int avtext_print_string(AVTextFormatContext *tctx, const char *key, const char *val, int flags);
void avtext_print_unit_int(AVTextFormatContext *tctx, const char *key, int value, const char *unit);
--
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".