From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 10C9D4E7C5 for ; Wed, 11 Jun 2025 19:58:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id ABEA368A51F; Wed, 11 Jun 2025 22:57:46 +0300 (EEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9D7DC68B137 for ; Wed, 11 Jun 2025 22:57:39 +0300 (EEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-3a54836cb7fso162407f8f.2 for ; Wed, 11 Jun 2025 12:57:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749671859; x=1750276659; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sUPrzoX/o99F1QHHHBwJpO7u39gcN9dpKd8xbNjJrzs=; b=Iup9KgNteOMRhWNsJiVRfU0v2c4+1drl20oSpfT/C3L0nwkui6OsXwYNZAXK6aivGn HXVcGZJTon36XPtsLScQkZRW6bKliyW6NTSwz813SBvpg/B90uPBBQyY7GsSoUPsXscL QvCPpzoBuD6WbiEzKswY2r9SzwsTYOm6mThgXb5juj+yEIutwHHRvfc9Bhs8+FzO4ZV2 AhL7H3FOuBRIGbJDm6eVASGW6fjETdUZI+R3umbfWPKk4/0h7K9Us7IedRI0P9rfQxiU Wkcn7lWVuQoy7xQt1jBpCKY5c6/vZi7dWi698OeU5ksQF8jm0zHCfrLr5pAG1UWfKeNd TH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749671859; x=1750276659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sUPrzoX/o99F1QHHHBwJpO7u39gcN9dpKd8xbNjJrzs=; b=bUKbF8ErqHifNapW2D9APbW45fWWc4I9RbWfgTT8TtPLTbLmcJd3fip/EMReJX47fN ryIV8qsntG+igveUA/mFMeoc4yBlSV3SFP0Eh9zyLyILLUWX6C4WqMdR/EZYPRcF9XZ4 t6vHeDVeYKcpWui5hThRXEl4+YXes4A0ntIHGQdNYFO+oD51FhMC9VEJdz6zrz8EPpYf g5lyI7mCoo8R9c+GbqYnoIIAiPsgsqY4+EhGTdUInYNKwMk9Vbz8MsqWvLQ8JGuVXP8j R6m8IbQI8hTxDPxLsoatDn2EzfqtOllJQmH12qVD6ojmiz464lu+y688rRMtnso/E/Kj 37cQ== X-Gm-Message-State: AOJu0Yyv8AgmQkckn6u1rUngkVR3HgjtRh4viPnuJNvX73Ma5Te2RsN1 k0q9bAu1+EGH0sC1Xfm3GLX1eu0zqEFJIybzPgIFbs+8T+vCU2+g8sGyT64X8Q== X-Gm-Gg: ASbGncul0yvOJxZepxVoEhOaa8PmIJYMNIuExSyxCeEJM+BTJL7ye0+KW5/Wx3GuX99 ulv8o601BcmRA/6fPCfvAfsdeGaZ7GXd+rKBy013N6FLrUm6a/zie+QG34Lwcd5tdCkqguzv8io DOTp6kHp+5r4NdEm6Qx33C5THgA7VzWoN/iz6reSuU2qEljtB13bMQd19zUbkGYth0YJbvOlsF9 N8eSfsh37nX0k/pR3owMzVkPdpGjhIgKkYrtfetdYuaZ37dwNebmUJD0L+Mkd2f3tIVEPYOsbts EUqj6OyFxSSzxD/UfbqxUKAHnL/T0gd6MHNam1tXQauPO+Oa1dY3WkZq36reHcsbCZxO1nAtzBI vY1FLFm9HrV0YS0KnV6umu5F1kIWISdoXYTsLRej2i7WiI9H0k7labs1PFwH3suC8CQmvv1jMS3 M+3+SbjQ== X-Google-Smtp-Source: AGHT+IHFLv1hdK4JIPNetEMmjbPCeLzXz4f94bJJ7vnUNS7XAzb7uFbV2GY6bl9ya8c5TXxUx4CtlQ== X-Received: by 2002:a05:6000:250a:b0:3a4:f70e:abda with SMTP id ffacd0b85a97d-3a558691962mr3768770f8f.10.1749671858834; Wed, 11 Jun 2025 12:57:38 -0700 (PDT) Received: from localhost.localdomain (p200301023700450060f2a9d7350ce887.dip0.t-ipconnect.de. [2003:102:3700:4500:60f2:a9d7:350c:e887]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a53244f04dsm16232467f8f.73.2025.06.11.12.57.38 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Jun 2025 12:57:38 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jun 2025 21:57:24 +0200 Message-Id: <20250611195725.95154-3-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250611195725.95154-1-epirat07@gmail.com> References: <20250611195725.95154-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/textformat: infer type in mermaid_print_value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Instead of the caller having to indicate if it is passing an integer, just use the fact that str is NULL when an integer is to be printed. --- fftools/textformat/tf_mermaid.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c index dbe489a7a7..da371c8fff 100644 --- a/fftools/textformat/tf_mermaid.c +++ b/fftools/textformat/tf_mermaid.c @@ -547,7 +547,7 @@ static void mermaid_print_section_footer(AVTextFormatContext *tfc) } static void mermaid_print_value(AVTextFormatContext *tfc, const char *key, - const char *str, int64_t num, const int is_int) + const char *str, int64_t num) { MermaidContext *mmc = tfc->priv; const AVTextFormatSection *section = tf_get_section(tfc, tfc->level); @@ -587,7 +587,7 @@ static void mermaid_print_value(AVTextFormatContext *tfc, const char *key, switch (mmc->diagram_config->diagram_type) { case AV_DIAGRAMTYPE_GRAPH: - if (is_int) { + if (!str) { writer_printf(tfc, "%s: %"PRId64"", key, key, num); } else { ////AVBPrint b; @@ -617,7 +617,7 @@ static void mermaid_print_value(AVTextFormatContext *tfc, const char *key, MM_INDENT(); - if (is_int) + if (!str) writer_printf(tfc, " %s %"PRId64" %s\n", key, num, col_type); else writer_printf(tfc, " %s %s %s\n", key, str, col_type); @@ -630,7 +630,7 @@ static void mermaid_print_value(AVTextFormatContext *tfc, const char *key, av_bprintf(buf, "%s", "
"); av_bprintf(buf, ""); - if (is_int) + if (!str) av_bprintf(buf, "%s: %"PRId64"", key, num); else av_bprintf(buf, "%s", str); @@ -641,12 +641,12 @@ static void mermaid_print_value(AVTextFormatContext *tfc, const char *key, static inline void mermaid_print_str(AVTextFormatContext *tfc, const char *key, const char *value) { - mermaid_print_value(tfc, key, value, 0, 0); + mermaid_print_value(tfc, key, value, 0); } static void mermaid_print_int(AVTextFormatContext *tfc, const char *key, int64_t value) { - mermaid_print_value(tfc, key, NULL, value, 1); + mermaid_print_value(tfc, key, NULL, value); } const AVTextFormatter avtextformatter_mermaid = { -- 2.39.5 (Apple Git-154) _______________________________________________ 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".