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 032B54E84B
for <ffmpegdev@gitmailbox.com>; Thu, 8 May 2025 01:38:20 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5B0B68C1FD;
Thu, 8 May 2025 04:38:08 +0300 (EEST)
Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com
[209.85.210.175])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D94368C176
for <ffmpeg-devel@ffmpeg.org>; Thu, 8 May 2025 04:37:32 +0300 (EEST)
Received: by mail-pf1-f175.google.com with SMTP id
d2e1a72fcca58-736b350a22cso491868b3a.1
for <ffmpeg-devel@ffmpeg.org>; Wed, 07 May 2025 18:37:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746668250; x=1747273050; 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=EYGKJbxrArxwhi1oWcCYTOuWcl2XpAfCX4v05IJullY=;
b=Q4Xcbacl9xbDnO9zopABuOwpgYySyfsJrbXz8+wZ6ZKbaFHz0PJZA0t0S3laOp5LaN
sUQTHBbraxL++xjeS1XsGqaEZpqtsgHSWKsXukZTZ/diEt5F0n2Wvs0EcOAVvFxI5+06
9zfky2HdXj+d5Jyq8NE3Scg6+MQDbHbgDsUp7JXzg8ht1x+xKTa4b6q1IEtzGzKj5uM/
tcuUr5sgXhNO5DOj74OOQ3+cXNsFTV5orW0gErcr2VKNqBUmgsUwfPWtJGhkm0LRai1/
MnGQyQwZLUwDEpnmbBiv0gCxkxHeomQJm4/w++MZetHrf0lNKlVR/wV1buJb3aHrf/d1
xGdA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746668250; x=1747273050;
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=EYGKJbxrArxwhi1oWcCYTOuWcl2XpAfCX4v05IJullY=;
b=Ih7Dx3WEJBaLYgrLCsNj4QAKCBYdGROTbJGNcdJ217QQj5HeC4ZxMc4sJbQX1sOsAE
dRlwEHoyLbdMeyNd5OI72x1t7+5xMyUtsR86ZIaLNKZ5J+qcwH5P2aDsW2kMo01E2LAP
N3Iu9816BlcqOxNThZaQsfAJ9a39e/ljrRCyTQymnsH9I4mjCiPvBOIntY9d8E31Ln8P
CZxJBzN5RJNcYijKZgw+RmT3k8Z7Je+bYIcRERRLPKGCJK16z+TuvxuZusfpvslkxFcO
OsqRAcaYwzQ8IkEu6bO1J2Q9Oy090IpSrEnVHIcsplo6YxC2wv/DEP0DeVv5b93drVYR
31ag==
X-Gm-Message-State: AOJu0Yxd8+VmLcce6cSQCw14QyRsyXKE2d9/Cla3Tx/vfFwKTJnuy73Y
KRvG7hPCs9bDlCfcsYS9P9rhBmmJAiVQaz7ii6KnQtsnO/W0qPC5jiK6jQ==
X-Gm-Gg: ASbGncu3iAcPlnM2jXIbT+J7tOHYRmLXW/Wg0aAfnhEYcUkm8hwh/6py0gyJKkh0evq
gYpkdzzJV6QEnxjhHuJJFdLAhikOO6plgmy5sixqXiaAYR/t5DcJlDri4LC7ycbD+xeLu3GM7NY
QJDIr4rF0R1bG3Hrwq3Xph5b1GDZtmuDOxNksw1v50Avbl2SI+OEugM/2KGQ1/y2lcynZM8b04/
P1oh9xZp46WMsnhse7mSm+Ypi0SaSGfreqkWdv6zYsE+65q+BBGxVTwVMCLIld/wV8ePpQWe6hK
hfUGHH9whdX2clKmlH7EO7dOIbAdkxtk0Idm0WMfzr2/lcIZFc7Hy7icKlY=
X-Google-Smtp-Source: AGHT+IFFXS8vdzW8Sh/xme0TQnFrJqzhIzLMpm/3HBZCLCPE1NjDXI0bQMxJQQLiFR5ev+GLXgLPPQ==
X-Received: by 2002:a05:6a21:2d05:b0:203:c29b:eb6c with SMTP id
adf61e73a8af0-2148b113440mr7898517637.4.1746668250553;
Wed, 07 May 2025 18:37:30 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-b1fb3c442b7sm10256115a12.54.2025.05.07.18.37.30
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 07 May 2025 18:37:30 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <da6a27182d696056ccb2303c49903606eee4f7e4.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:46 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v12 05/15] fftools/avtextformat: Re-use
BPrint in loop
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/da6a27182d696056ccb2303c49903606eee4f7e4.1746668216.git.ffmpegagent@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: softworkz <softworkz@hotmail.com>
Instead of initializing a new BPrint in case of UTF decode error,
re-use the same BPrint struct and just clear it
for each iteration.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
fftools/textformat/avtextformat.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/fftools/textformat/avtextformat.c b/fftools/textformat/avtextformat.c
index 8ee7472f1b..ec167e3bf1 100644
--- a/fftools/textformat/avtextformat.c
+++ b/fftools/textformat/avtextformat.c
@@ -311,24 +311,28 @@ void avtext_print_integer(AVTextFormatContext *tctx, const char *key, int64_t va
static inline int validate_string(AVTextFormatContext *tctx, char **dstp, const char *src)
{
- const uint8_t *p, *endp;
+ const uint8_t *p, *endp, *srcp = (const uint8_t *)src;
AVBPrint dstbuf;
+ AVBPrint invalid_seq;
int invalid_chars_nb = 0, ret = 0;
+ *dstp = NULL;
av_bprint_init(&dstbuf, 0, AV_BPRINT_SIZE_UNLIMITED);
+ av_bprint_init(&invalid_seq, 0, AV_BPRINT_SIZE_UNLIMITED);
- endp = src + strlen(src);
- for (p = src; *p;) {
- uint32_t code;
+ endp = srcp + strlen(src);
+ for (p = srcp; *p;) {
+ int32_t code;
int invalid = 0;
const uint8_t *p0 = p;
if (av_utf8_decode(&code, &p, endp, tctx->string_validation_utf8_flags) < 0) {
- AVBPrint bp;
- av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
- bprint_bytes(&bp, p0, p-p0);
- av_log(tctx, AV_LOG_DEBUG,
- "Invalid UTF-8 sequence %s found in string '%s'\n", bp.str, src);
+
+ av_bprint_clear(&invalid_seq);
+
+ bprint_bytes(&invalid_seq, p0, p - p0);
+
+ av_log(tctx, AV_LOG_DEBUG, "Invalid UTF-8 sequence '%s' found in string '%s'\n", invalid_seq.str, src);
invalid = 1;
}
@@ -358,6 +362,7 @@ static inline int validate_string(AVTextFormatContext *tctx, char **dstp, const
end:
av_bprint_finalize(&dstbuf, dstp);
+ av_bprint_finalize(&invalid_seq, NULL);
return ret;
}
--
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".