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 F217A4E51E for <ffmpegdev@gitmailbox.com>; Sun, 4 May 2025 02:58:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84F0168B7FA; Sun, 4 May 2025 05:58:02 +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 F22B168B978 for <ffmpeg-devel@ffmpeg.org>; Sun, 4 May 2025 05:58:01 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-30a452d3b38so2692802a91.3 for <ffmpeg-devel@ffmpeg.org>; Sat, 03 May 2025 19:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746327480; x=1746932280; 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=FJQax4ttSytyqyCMrvX/F2clfpEQMPYP5CXPeutyoWQvYuVAJqKUIcPvVcGmQKMBzJ R8xRlujm54Bqvey2JNcNML1B0WkAnEuvIUS3YSUeL8KYLQOOdziwfiyAr0BA3vec2vZG v25b1h7BRng3LTdWRAaya0l4YpAMG6PNsO8Vq/sOj3xCaCZc8NJLZVkX/ndfSOg8/BmJ N1jPQqpBhmcaQ+nbFTE/CqwOCsHIi6G+d/kNzt2dImcfy5P6pgrS9OVFxx2rtlJ8s8ug 5u+7Z9N+bTbmNll6W3gmpGc1GMaKd8wvvgT1CwWcYnurd2WXSqqiOkUF7tz/OQP2+qKk LWmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746327480; x=1746932280; 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=eWrm332ET6Krwk10V2zL0NdbMBZhOFKQ5z0jkRS15G7EUjHBccJkH4StoJFMQKAjQ6 TeaCpfzcZdnrnQQyLsBHPx7URYJqv86aQ05DpJ+auYp4gWErRMrQyeiPyTEzoeru7sZ6 iDrz+Ph7zAaNxvYNuEOH2fhW5Bjb3yoJ8RTijBL5qJqWmRUMiN92wHs4El1NDNsE14uF 9OsT06GlDFLFoaVCDX+tNq9yodYR9cMKLwz+GIhX/MhA9J7NICvwscDuEzLC0bzOKurg p/2NWnyQ+OdBrYwtfkfZ7bPg1ZEZC+nCojXZ7i+QsatdMkvnAjvP5+4Kmq3EitfU45YW wBvw== X-Gm-Message-State: AOJu0YzR7keo07xOJ+ZoHdxjkp7XBMsjEAyx/g6qugZYlm+PiWrZLijY Vc7BV7yHEctXXS5VtscuxBW7ikZn8bemgEQ+b9xtO1giv1zDl5AP0R9OSA== X-Gm-Gg: ASbGncuFpjMoN1MASnBhpIq1PRQLd++Bz8FU1iaOaMhg0BADhfFuAMeXLc3KJIyVEgf 9wlD5Bcs53PMmZAr8O9RyC8LBAJW5U0F9kWXZ42c7GNCTjKZrTUKwzSPtdsqphvBunxjzKhzB7F Qqtn+vdiZvhCxCNyVzpIoZt1REi3/5Yrrk9xPXxqdjK1WclNv5W7kB4ldWlKHwm6MuWkNYILEkX xT497pNTOaEBLlgnjKEPfFJ5VCVeT7xORcNH4CKUn33LyngzJJ/jPM/oM+XlSPkBIlPeI42WmQI yUwhT3N+xPpk0PaJjT/0ZOHEgKQiBjYUY8uEdtXu8v++lZhKaWQ0qQXV3hk= X-Google-Smtp-Source: AGHT+IFK01lc3paO1EOLDoBrhGiEWRhhOTUsFBZrjDPTogkSyww2tBdcvNn9wKHyOylK15CWracOYA== X-Received: by 2002:a17:90a:c884:b0:2fe:e9c6:689e with SMTP id 98e67ed59e1d1-30a4e5a50bdmr11794539a91.8.1746327480053; Sat, 03 May 2025 19:58:00 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30a47625aeasm5834601a91.36.2025.05.03.19.57.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 May 2025 19:57:59 -0700 (PDT) From: softworkz <ffmpegagent@gmail.com> X-Google-Original-From: softworkz <softworkz@hotmail.com> Message-Id: <26af65e6f2f513b9bdee8fe5d924cab83dc26450.1746327446.git.ffmpegagent@gmail.com> In-Reply-To: <pull.66.v10.ffstaging.FFmpeg.1746327446.ffmpegagent@gmail.com> References: <pull.66.v9.ffstaging.FFmpeg.1746260565.ffmpegagent@gmail.com> <pull.66.v10.ffstaging.FFmpeg.1746327446.ffmpegagent@gmail.com> Date: Sun, 04 May 2025 02:57:16 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v10 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.1746327446.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".