From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CBCF6483C6 for ; Sat, 2 Dec 2023 14:55:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06F7768CAAA; Sat, 2 Dec 2023 16:55:06 +0200 (EET) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2AB768CAAA for ; Sat, 2 Dec 2023 16:54:58 +0200 (EET) Received: from fwd82.aul.t-online.de (fwd82.aul.t-online.de [10.223.144.108]) by mailout06.t-online.de (Postfix) with SMTP id 4FD83C425 for ; Sat, 2 Dec 2023 15:54:58 +0100 (CET) Received: from [192.168.178.79] ([84.182.237.72]) by fwd82.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1r9ROT-0ZESWH0; Sat, 2 Dec 2023 15:54:57 +0100 Message-ID: From: Lennart Klebl To: ffmpeg-devel@ffmpeg.org Date: Sat, 02 Dec 2023 15:54:34 +0100 Autocrypt: addr=lennart.klebl@t-online.de; prefer-encrypt=mutual; keydata=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 Smj4HKTOvTQzFn8L5A== Content-Type: multipart/mixed; boundary="=-Yrgh1aFmp4DTrP6kKdEW" User-Agent: Evolution 3.50.2 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1701528897-F67FB954-CE2D29B8/0/0 CLEAN NORMAL X-TOI-MSGID: 37b336c7-7ec5-4016-a6e2-9ef47bcb50a0 Subject: [FFmpeg-devel] [PATCH] avfilter: allow floating point formatting in expr_int_format (vf_drawtext.c) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --=-Yrgh1aFmp4DTrP6kKdEW Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Since I was trying for quite some time to get proper floating point formatting of positive and negative numbers working with the existing drawtext/expr_int_format implementation, I added the f format specifier that is only applied when used in conjunction with a width. --=-Yrgh1aFmp4DTrP6kKdEW Content-Disposition: attachment; filename*0=0001-avfilter-allow-floating-point-formatting-in-expr_int.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-avfilter-allow-floating-point-formatting-in-expr_int.patch"; charset="UTF-8" RnJvbSAxNGM0MzhhMmJjZjJlYTE3YTY4MThlZjVjZGM2YTdlZTllZjMwMTg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAibGVubmFydC5rbGVibEB0LW9ubGluZS5kZSIgPGxlbm5hcnQu a2xlYmxAdC1vbmxpbmUuZGU+CkRhdGU6IFNhdCwgMiBEZWMgMjAyMyAxNTo1MzoyMCArMDEwMApT dWJqZWN0OiBbUEFUQ0hdIGF2ZmlsdGVyOiBhbGxvdyBmbG9hdGluZyBwb2ludCBmb3JtYXR0aW5n IGluIGV4cHJfaW50X2Zvcm1hdAogKHZmX2RyYXd0ZXh0LmMpCgotLS0KIGRvYy9maWx0ZXJzLnRl eGkgICAgICAgICAgfCAxMiArKysrKysrKy0tLS0KIGxpYmF2ZmlsdGVyL3ZmX2RyYXd0ZXh0LmMg fCAxOSArKysrKysrKysrKysrKy0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMo KyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2ZpbHRlcnMudGV4aSBiL2RvYy9m aWx0ZXJzLnRleGkKaW5kZXggZGUxOWQxMzBjYy4uMWIxMTEyNDQzNCAxMDA2NDQKLS0tIGEvZG9j L2ZpbHRlcnMudGV4aQorKysgYi9kb2MvZmlsdGVycy50ZXhpCkBAIC0xMjgwNywxNCArMTI4MDcs MTggQEAgdGhlIGNvbnN0YW50cyBAdmFye3RleHRfd30gYW5kIEB2YXJ7dGV4dF9ofSB3aWxsIGhh dmUgYW4gdW5kZWZpbmVkCiB2YWx1ZS4KIAogQGl0ZW0gZXhwcl9pbnRfZm9ybWF0LCBlaWYKLUV2 YWx1YXRlIHRoZSBleHByZXNzaW9uJ3MgdmFsdWUgYW5kIG91dHB1dCBhcyBmb3JtYXR0ZWQgaW50 ZWdlci4KK0V2YWx1YXRlIHRoZSBleHByZXNzaW9uJ3MgdmFsdWUgYW5kIG91dHB1dCBhcyBmb3Jt YXR0ZWQgaW50ZWdlciBvciBmbG9hdGluZworcG9pbnQgbnVtYmVyLgogCiBUaGUgZmlyc3QgYXJn dW1lbnQgaXMgdGhlIGV4cHJlc3Npb24gdG8gYmUgZXZhbHVhdGVkLCBqdXN0IGFzIGZvciB0aGUg QHZhcntleHByfSBmdW5jdGlvbi4KIFRoZSBzZWNvbmQgYXJndW1lbnQgc3BlY2lmaWVzIHRoZSBv dXRwdXQgZm9ybWF0LiBBbGxvd2VkIHZhbHVlcyBhcmUgQHNhbXB7eH0sCi1Ac2FtcHtYfSwgQHNh bXB7ZH0gYW5kIEBzYW1we3V9LiBUaGV5IGFyZSB0cmVhdGVkIGV4YWN0bHkgYXMgaW4gdGhlCitA c2FtcHtYfSwgQHNhbXB7ZH0sIEBzYW1we3V9LCBhbmQgQHNhbXB7Zn0uIFRoZXkgYXJlIHRyZWF0 ZWQgZXhhY3RseSBhcyBpbiB0aGUKIEBjb2Rle3ByaW50Zn0gZnVuY3Rpb24uCi1UaGUgdGhpcmQg cGFyYW1ldGVyIGlzIG9wdGlvbmFsIGFuZCBzZXRzIHRoZSBudW1iZXIgb2YgcG9zaXRpb25zIHRh a2VuIGJ5IHRoZSBvdXRwdXQuCi1JdCBjYW4gYmUgdXNlZCB0byBhZGQgcGFkZGluZyB3aXRoIHpl cm9zIGZyb20gdGhlIGxlZnQuCisKK1doZW4gc3BlY2lmeWluZyBAc2FtcHtmfSwgdGhlIHRoaXJk IHBhcmFtZXRlciBpcyByZXF1aXJlZCBhbmQgc3BlY2lmaWVzIHRoZQorbnVtYmVyIG9mIGRlY2lt YWwgcGxhY2VzIGZvciBmbG9hdGluZyBwb2ludCBmb3JtYXR0aW5nLiBPdGhlcndpc2UsIHRoZSB0 aGlyZAorcGFyYW1ldGVyIGlzIG9wdGlvbmFsIGFuZCBzZXRzIHRoZSBudW1iZXIgb2YgcG9zaXRp b25zIHRha2VuIGJ5IHRoZSBvdXRwdXQuIEl0CitjYW4gYmUgdXNlZCB0byBhZGQgcGFkZGluZyB3 aXRoIHplcm9zIGZyb20gdGhlIGxlZnQuCiAKIEBpdGVtIGdtdGltZQogVGhlIHRpbWUgYXQgd2hp Y2ggdGhlIGZpbHRlciBpcyBydW5uaW5nLCBleHByZXNzZWQgaW4gVVRDLgpkaWZmIC0tZ2l0IGEv bGliYXZmaWx0ZXIvdmZfZHJhd3RleHQuYyBiL2xpYmF2ZmlsdGVyL3ZmX2RyYXd0ZXh0LmMKaW5k ZXggYzU0NzdjYmZmMS4uYmUwNDkwYmJiMyAxMDA2NDQKLS0tIGEvbGliYXZmaWx0ZXIvdmZfZHJh d3RleHQuYworKysgYi9saWJhdmZpbHRlci92Zl9kcmF3dGV4dC5jCkBAIC0xMzU5LDYgKzEzNTks NyBAQCBzdGF0aWMgaW50IGZ1bmNfZXZhbF9leHByX2ludF9mb3JtYXQoQVZGaWx0ZXJDb250ZXh0 ICpjdHgsIEFWQlByaW50ICpicCwKICAgICBpbnQgcmV0OwogICAgIHVuc2lnbmVkIGludCBwb3Np dGlvbnMgPSAwOwogICAgIGNoYXIgZm10X3N0clszMF0gPSAiJSI7CisgICAgY2hhciBmbXRfYXJn ID0gYXJndlsxXVswXTsKIAogICAgIC8qCiAgICAgICogYXJndlswXSBleHByZXNzaW9uIHRvIGJl IGNvbnZlcnRlZCB0byBgaW50YApAQCAtMTM3Niw5ICsxMzc3LDkgQEAgc3RhdGljIGludCBmdW5j X2V2YWxfZXhwcl9pbnRfZm9ybWF0KEFWRmlsdGVyQ29udGV4dCAqY3R4LCBBVkJQcmludCAqYnAs CiAgICAgICAgIHJldHVybiByZXQ7CiAgICAgfQogCi0gICAgaWYgKCFzdHJjaHIoInhYZHUiLCBh cmd2WzFdWzBdKSkgeworICAgIGlmICghc3RyY2hyKCJ4WGR1ZiIsIGZtdF9hcmcpKSB7CiAgICAg ICAgIGF2X2xvZyhjdHgsIEFWX0xPR19FUlJPUiwgIkludmFsaWQgZm9ybWF0ICclYycgc3BlY2lm aWVkLCIKLSAgICAgICAgICAgICAgICAiIGFsbG93ZWQgdmFsdWVzOiAneCcsICdYJywgJ2QnLCAn dSdcbiIsIGFyZ3ZbMV1bMF0pOworICAgICAgICAgICAgICAgICIgYWxsb3dlZCB2YWx1ZXM6ICd4 JywgJ1gnLCAnZCcsICd1JywgJ2YnXG4iLCBmbXRfYXJnKTsKICAgICAgICAgcmV0dXJuIEFWRVJS T1IoRUlOVkFMKTsKICAgICB9CiAKQEAgLTE0MDAsMTQgKzE0MDEsMjIgQEAgc3RhdGljIGludCBm dW5jX2V2YWxfZXhwcl9pbnRfZm9ybWF0KEFWRmlsdGVyQ29udGV4dCAqY3R4LCBBVkJQcmludCAq YnAsCiAgICAgfQogI2VuZGlmCiAKKyAgICBpZiAoZm10X2FyZyA9PSAnZicgJiYgYXJnYyA8IDMp IGZtdF9hcmcgPSAnZCc7CisKICAgICBpZiAoYXJnYyA9PSAzKQotICAgICAgICBhdl9zdHJsY2F0 ZihmbXRfc3RyLCBzaXplb2YoZm10X3N0ciksICIwJXUiLCBwb3NpdGlvbnMpOwotICAgIGF2X3N0 cmxjYXRmKGZtdF9zdHIsIHNpemVvZihmbXRfc3RyKSwgIiVjIiwgYXJndlsxXVswXSk7CisgICAg ICAgIGlmIChmbXRfYXJnID09ICdmJykKKyAgICAgICAgICAgIGF2X3N0cmxjYXRmKGZtdF9zdHIs IHNpemVvZihmbXRfc3RyKSwgIi4ldSIsIHBvc2l0aW9ucyk7CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIGF2X3N0cmxjYXRmKGZtdF9zdHIsIHNpemVvZihmbXRfc3RyKSwgIjAldSIsIHBvc2l0 aW9ucyk7CisgICAgYXZfc3RybGNhdGYoZm10X3N0ciwgc2l6ZW9mKGZtdF9zdHIpLCAiJWMiLCBm bXRfYXJnKTsKIAogICAgIGF2X2xvZyhjdHgsIEFWX0xPR19ERUJVRywgIkZvcm1hdHRpbmcgdmFs dWUgJWYgKGV4cHIgJyVzJykgd2l0aCBzcGVjICclcydcbiIsCiAgICAgICAgICAgICByZXMsIGFy Z3ZbMF0sIGZtdF9zdHIpOwogCi0gICAgYXZfYnByaW50ZihicCwgZm10X3N0ciwgaW50dmFsKTsK KyAgICBpZiAoZm10X2FyZyA9PSAnZicpCisgICAgICAgIGF2X2JwcmludGYoYnAsIGZtdF9zdHIs IHJlcyk7CisgICAgZWxzZQorICAgICAgICBhdl9icHJpbnRmKGJwLCBmbXRfc3RyLCBpbnR2YWwp OwogCiAgICAgcmV0dXJuIDA7CiB9Ci0tIAoyLjQzLjAKCg== --=-Yrgh1aFmp4DTrP6kKdEW Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --=-Yrgh1aFmp4DTrP6kKdEW--