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 A9CC14BDBD
for <ffmpegdev@gitmailbox.com>; Sun, 4 May 2025 22:36:22 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 660D368BC9A;
Mon, 5 May 2025 01:35:41 +0300 (EEST)
Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com
[209.85.210.179])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 217BA68B722
for <ffmpeg-devel@ffmpeg.org>; Mon, 5 May 2025 01:35:39 +0300 (EEST)
Received: by mail-pf1-f179.google.com with SMTP id
d2e1a72fcca58-73972a54919so3531944b3a.3
for <ffmpeg-devel@ffmpeg.org>; Sun, 04 May 2025 15:35:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746398138; x=1747002938; 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=HLHdmuYLBigLG/L5oNuU9BFEgjbrze5MpGL1E7+ASsk=;
b=KKPo+kV2JAOqzvIPJc1gFtuh9opVLk1lmpVzOiatcsIewjYW8TRrX5W4V1bC3FwV72
tYKC6Lwz1k1FOwZYrO6HkJrfZiCpLKb45ACTFt5HFUtgJ4z0MTkdjz/iUACK50ZXbXih
cf7JuI0vfpMwEkePn9oCb4XdktfmZG3qddyxgbsc5r2b2brK7G9fvS/tn1zz/SAp0Fp2
hvZEbXn6q3YB8Hk6c9Bykz0a9KlTg3mW6CItwV4ZE7DYT70XdTQf8lgL7/LTIYaFFY1T
5OgNu2e+ht/KXwhoJt+CNWx3QMVvrYNAxAvncizO5ozNsJ75ur3KXFCEXPMSrZTPJXqq
Hpow==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746398138; x=1747002938;
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=HLHdmuYLBigLG/L5oNuU9BFEgjbrze5MpGL1E7+ASsk=;
b=W1xpOeE0wi5HE34KnRKWSPZfZVtBZO8XfDtZ6G+m18IQHkI9X5TRtMXU4nLA8ieCuo
Hc++D9AeOFLCsWzhJKbLMw5rt6hqDjHGF1937LyKfDiIcP9aY6dNTJUVq43VdE5N5G8O
lWG++cFmkxWIoJhC2/NQ6tLrkkDfyTdFs8isITxaPdJlJ8NI94MUzNiC0D5Gxv8qOS57
5d2qLomTKQR/9ka0LGZuxSzickd62C4Pbwav6azGzgPf+OTayokAAuFAdP1xqc4TXcUz
bebNlrtTIUZzQUFtMVKfJxFHEAC9k7T1tpF6ayQz02h84Zh5zTxSNFNBq7+OebdggJKo
VhxQ==
X-Gm-Message-State: AOJu0YyXlzQzbfyA32rthLDz1fWe77SGryp7lR3V8HcUlcAjsLZadH1W
HiAP4rxkXmCzrCKtm72FdFOJPHV7Rv/9J2mcKmtIvNHiCYgAnusJcbS5Nndm
X-Gm-Gg: ASbGnctsqs7ceAu5qERxttHa2vPGyMxRIRVPcez2IbRKzxtEivN1VsTT8v2t8oi4PAU
r3xb2pCa7AoZgKS3uw5dK/LYA6TrH8wuNj9zF+lNgHQnYcX1cNNjgOVwwKeZRR1W+iE+7yTAcnM
Ag+8aMxywMX0ReGlfErrby5Unsp2zu0CPTSYDJ50gaePBhNC8TG9ufrgtDn2aqMXt8eGW2dAhQD
3zIzINXlM7qo6FrVvhNsYK/tfzj8WZKcjQywxEQeBve81RVSQP+o+bZ/4PSbIMvzW9qac42ziPH
kgy8e2nhc73iBkSgHzh54XKNZUTg4b3Y2C2x8b0Ox61LWFuvPfeQsk5iSbo=
X-Google-Smtp-Source: AGHT+IEwfZt8e1WuFiIEJjp0/QMmfLfBavWQBhJQAYnzWvRlpG9wgUY/dkhvX/qtw+OOTCmtA8KfZw==
X-Received: by 2002:a05:6a00:6c90:b0:73f:ff25:90b3 with SMTP id
d2e1a72fcca58-7406f1b08b6mr8381848b3a.24.1746398138288;
Sun, 04 May 2025 15:35:38 -0700 (PDT)
Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-74058d7a473sm5539863b3a.18.2025.05.04.15.35.38
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Sun, 04 May 2025 15:35:38 -0700 (PDT)
From: softworkz <ffmpegagent@gmail.com>
X-Google-Original-From: softworkz <softworkz@hotmail.com>
Message-Id: <26af65e6f2f513b9bdee8fe5d924cab83dc26450.1746398104.git.ffmpegagent@gmail.com>
In-Reply-To: <pull.66.v11.ffstaging.FFmpeg.1746398104.ffmpegagent@gmail.com>
References: <pull.66.v10.ffstaging.FFmpeg.1746327446.ffmpegagent@gmail.com>
<pull.66.v11.ffstaging.FFmpeg.1746398104.ffmpegagent@gmail.com>
Date: Sun, 04 May 2025 22:34:54 +0000
Fcc: Sent
MIME-Version: 1.0
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH v11 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/26af65e6f2f513b9bdee8fe5d924cab83dc26450.1746398104.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 each iteration of
the loop, re-use the same BPrint struct and just clear it
for each iteration.
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 1cd9555ca8..b2c3aa3fc7 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 bp_invalid_seq;
int invalid_chars_nb = 0, ret = 0;
+ *dstp = NULL;
av_bprint_init(&dstbuf, 0, AV_BPRINT_SIZE_UNLIMITED);
+ av_bprint_init(&bp_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(&bp_invalid_seq);
+
+ bprint_bytes(&bp_invalid_seq, p0, p - p0);
+
+ av_log(tctx, AV_LOG_DEBUG, "Invalid UTF-8 sequence %s found in string '%s'\n", bp_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(&bp_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".