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 6F1304BBBD for <ffmpegdev@gitmailbox.com>; Tue, 29 Apr 2025 01:01:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE43668B15E; Tue, 29 Apr 2025 04:00:52 +0300 (EEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CADE68AE4D for <ffmpeg-devel@ffmpeg.org>; Tue, 29 Apr 2025 04:00:40 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-309f3bf23b8so5899304a91.3 for <ffmpeg-devel@ffmpeg.org>; Mon, 28 Apr 2025 18:00:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745888438; x=1746493238; 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=IETOlSlV7yKHdPDGJfEiO46ZOu+WesgLaIHjvoBsuLqsNPTtRNiwUNBq1d0xc3154W iPkMgywAsqDkZpnVL8358ZqhnlAzBwXjb7yi5jHKhUJ/6WfnNg6Bigj+NLNX0IbQaNqs e4YbxvAWstULeTmqs/S+ZHFZK6trxPnQNnFwZMegNo8ER0cdl0mjhKFFgK7vikl52Bqp zz3mN5wVqIUQDRfQ5jMMKw7GS5N42UH66RTKTAneVRahwsDK+6FUKxQO8hkXu5krnL7x vNOwbl7COhVtbIQ0v730EOe+HwgdcUvQXMnNWJQRM+rl+lYt29wV+YYL+fJSQv9RYelw O+lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745888438; x=1746493238; 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=tnMpxh3CC2yqAZkVIU0flFyG7ZE1SxNvDUNZUSzXe4RpKrhqOsodk+2vGY6dpZyjmJ C5X1S/u1VVKPKhGuSHWQT+6BYnknsV+Thmuh74pfisuzhLEV6HcIfMZh44bPzzQ4gmpn 56Uxja4xKWZtDvYngvzFE1QtWfhUuWABve11kdld/0gHu+vFyrR0mGLYrPWugrirJgSj M4JqsVV+MLUaE4ThKqefOidL5FavAZRykbu6hEiGrVkNZ3xHgLPvTtFgRv3yA9rUWXG8 DHKOvy03QPnUw2LLiL4zxuTNRFbGkeYx7nKVbGutNjv6I/+0yjNtg8lgSkN5Z+ViCtOq sp5A== X-Gm-Message-State: AOJu0YzpcbNYIXjWU0Q07CxF56OuU7TC3+cWFLlhCeusnDSLaRwbM5Ua ApN06/K5R4yyHaAalOpO03k3KCFKa1S2mFtu9NJu8WapOd8XMf2hOJXkHQ== X-Gm-Gg: ASbGnctjYDEa0Qs5TLowxpNBFw4RbxxCn4nxv95pS5XParAp6oNqfRZwyUe07XLteqM L69vTMx018nNVwOBNhxpLYcnuaXjznFIERGskni6X/9T03L/NvffoEuQiXOy+qencoiliPMX+eL kS6LoWqIOR7ZZzRKh3lazGbZo7UryzZpAmmsKrFOtqgOHisrdrEetQ/G+eMl1akGujrnDjKpJsX V4215xeQiC/2aKnfc+cRvklgnEt+Tyu1Cf0EktB1p/CFrTgWKfx9W2EQcWXYu35rdJ8HjULEK+e im0Nz7UQMXfceEq1zf7T4kM1U3jfDvZLZSwGy9SK2hvEMz93vvn7oxTrqNw= X-Google-Smtp-Source: AGHT+IHiVVRGCGwuGR7xY+XJmQvBsARonFcFu9RlR7ytDmfi7umcSJvc58Q5kydCtvEHSZk6CEqBFA== X-Received: by 2002:a17:90b:574d:b0:2ff:6aa6:47a3 with SMTP id 98e67ed59e1d1-30a013b50c5mr15560688a91.25.1745888438475; Mon, 28 Apr 2025 18:00:38 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-309ef1475ccsm9755570a91.44.2025.04.28.18.00.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Apr 2025 18:00:38 -0700 (PDT) From: softworkz <ffmpegagent@gmail.com> X-Google-Original-From: softworkz <softworkz@hotmail.com> Message-Id: <606fa7866a37110fc5087537bf3637b4082e56c6.1745888404.git.ffmpegagent@gmail.com> In-Reply-To: <pull.66.v8.ffstaging.FFmpeg.1745888404.ffmpegagent@gmail.com> References: <pull.66.v7.ffstaging.FFmpeg.1745623868.ffmpegagent@gmail.com> <pull.66.v8.ffstaging.FFmpeg.1745888404.ffmpegagent@gmail.com> Date: Tue, 29 Apr 2025 00:59:54 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v8 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/606fa7866a37110fc5087537bf3637b4082e56c6.1745888404.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".