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 BE01E4DC92
for <ffmpegdev@gitmailbox.com>; Thu, 24 Apr 2025 01:15:02 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CDA568B8C6;
Thu, 24 Apr 2025 04:14:06 +0300 (EEST)
Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com
[209.85.210.171])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAF9168B999
for <ffmpeg-devel@ffmpeg.org>; Thu, 24 Apr 2025 04:14:03 +0300 (EEST)
Received: by mail-pf1-f171.google.com with SMTP id
d2e1a72fcca58-736aa9d0f2aso540782b3a.0
for <ffmpeg-devel@ffmpeg.org>; Wed, 23 Apr 2025 18:14:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1745457242; x=1746062042; 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=eYMYFjRzaZ5Yev9NmaG73SN/9lJkW6qttCUyIXgXgnhxWP/lh/TLc/O9ASSmvNXapk
ePUrXNrGqLuI7EQwV4kPbeOvJYA15qXALwAHk3BJAR7jSxZiCg3vcasUEtmxHTm9a1Sn
LOpCjFbXI/6qTC2RkLNocgImFIqwx9xvFd1jO0f04bII5nOmQYwMGBAU2kDwcLq4gClD
qCLKkuII1n6VhbLYw12eojR7tah8xup1eDREIUokBsiOzLf1GinKyyRb9q+CMCcQv+mf
I6lDVhKnKK0ifpIoFikFtxOOxHViyltD1lhgZACy90SHH6klKiQi6qwR3PpGtEQ749Ri
/O7g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1745457242; x=1746062042;
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=BySvVb7wPfIwoty8Y6TbLlP4As+9W/ZU5BkclPBC44wSwLJGb73y4SZtgRslU+g6cM
IDuqfnQHo2I9vPuMdz2SZF1Wb/TZKEbiVFFzPdtfo5sxxwAgfHpeMZToK9jEsrsye0Od
tq5bmSbI1q3PWYuHk2KLEqP6aTko/21d6ShoWMfu7ht4AK9mgzc0f1UKZg/Y7TbTnoWM
18Mw1Obyr7xyA3pUKiQcGUqcxRolsJj7WH0uam+a7ABo9UDr5pujig3t+S2x9W32nQ3y
MFGIDPwffysubbNRE9W2LXIXj05wFpBF0E873VcFtgK0s0GEEsNvD/m3oF0XaGCqpsRE
3qbg==
X-Gm-Message-State: AOJu0Yw4PBAVkwYcLfB7pMbH+bIWfJ0MS4NW9PDuRLUMVZ/yb5fLw4yK
e8rpBN5/Ea+gGzFCdUki1VBAbGIkCCMMVliplF+zxU9LiUVUvJKpsDJ+NA==
X-Gm-Gg: ASbGnctYpWFIuMrRCDOQpI68L2wa+yGS8tvSKW94uRLN1AUBeQXnca6okzO+pkOOYzA
2lKofryaJfupBx3WOxTjDSiotUsw9S2+znVNnUxB7VKqw2vTIOJZpO22DXaSAJ3de6VwGkA7MAP
kc7tZ+A7aXjpuQbjG1077jZ31JD77CwVegIMbNJVmFCPkNJgSE+DbUPtQnv1qYTjU128Pr0m8Sg
Y4EA2Gdu2vV03ocZyUlvmny0BoDWrLlCXNiiwFLLQf9cf0mOoMedy5zjz9dUAU1cWvUzrypK1VE
2wiZjj5hNRPBFYnEcI5K9Elo1Rqll/MyyNUkKkaG3ZBaf7nmgl/M6vjjvhM=
X-Google-Smtp-Source: AGHT+IHzutYbR5O/MKN4ZO/DgPHuKFghjT1u7fDOfJsozoFDx+kaQRwpw1paMJ8EtiqUKuOluN1qpw==
X-Received: by 2002:a05:6a00:35c7:b0:730:8a5b:6e61 with SMTP id
d2e1a72fcca58-73e243c6460mr1125639b3a.2.1745457242016;
Wed, 23 Apr 2025 18:14:02 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-73e25a9d459sm228297b3a.146.2025.04.23.18.14.01
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 23 Apr 2025 18:14:01 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <59dfd3ded633e1081e020f4ed99d851c5aecc79e.1745457192.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v6.ffstaging.FFmpeg.1745457192.ffmpegagent@gmail.com>
References: <pull.66.v5.ffstaging.FFmpeg.1745358943.ffmpegagent@gmail.com>
<pull.66.v6.ffstaging.FFmpeg.1745457192.ffmpegagent@gmail.com>
Date: Thu, 24 Apr 2025 01:13:05 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v6 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.1745457192.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".