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 7C561401F8 for ; Thu, 20 Jan 2022 12:04:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D8CC68B27E; Thu, 20 Jan 2022 14:04:51 +0200 (EET) Received: from shout02.mail.de (shout02.mail.de [62.201.172.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AA2C68B273 for ; Thu, 20 Jan 2022 14:04:45 +0200 (EET) Received: from postfix01.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout02.mail.de (Postfix) with ESMTP id 7FE1EA1D16 for ; Thu, 20 Jan 2022 13:04:44 +0100 (CET) Received: from smtp01.mail.de (smtp01.bt.mail.de [10.0.121.211]) by postfix01.mail.de (Postfix) with ESMTP id 66B92A03C1 for ; Thu, 20 Jan 2022 13:04:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1642680284; bh=Rtb7gyQsufIMogKk6NW0RS/mMPRtsSXC7hNjM2OqqFk=; h=Date:Subject:To:References:From:In-Reply-To:From; b=nIgJPwVR7DM0ZFuh+g4zc1tnLnvFYmj3BvhiNsscnZ32iHG4gqeBhlgv2L2G/TSTN n+SESzD6oUkUWq/Y+176x1fMo2aBpYl7TMyQXNGSyXYf937CHV0BnBn6zQUQky9pof pVeyKk7rzi+aQ7uP9o6r2mV9YE3bes05PmD42za63/+NO3RItv3Z5fPrdw/nhxNpy2 Hc9AtmXJcDUivvRG4scapgRie7CHzqXAWOXfCKL8HgqTw2CXtNCQ3lqtC5l3dz6XhK tHjvwZH/wur0zu4cNwObKiRv6BR2PU0vl5sHcB8nePhRDgpTMmnKLo5t9DKv385WPC qjRYO0yCJI8yQ== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp01.mail.de (Postfix) with ESMTPSA id 1AA9810013B for ; Thu, 20 Jan 2022 13:04:43 +0100 (CET) Content-Type: multipart/mixed; boundary="------------AjMFNWkgx3ivPl7YKywsyxqw" Message-ID: <5ead1511-a763-782e-7eff-e2256828978c@mail.de> Date: Thu, 20 Jan 2022 13:04:43 +0100 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <72e9521f-b029-8637-c32c-27cf7c5de170@mail.de> <14470aae-c127-7532-a054-b5d878d415dd@mail.de> <52e4f109-41a4-a609-b583-c001c6077638@mail.de> <350ccc44-07dc-25c6-49a1-4281139d93ac@mail.de> <8b8ae2a5-f77f-5a34-8890-fa68de09e475@mail.de> From: Thilo Borgmann In-Reply-To: X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 11625 X-purgate-ID: 154282::1642680284-00006BE6-E679EC78/0/0 Subject: Re: [FFmpeg-devel] [PATCH v2] lavfi/drawtext: Add localtime_ms for millisecond precision 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: This is a multi-part message in MIME format. --------------AjMFNWkgx3ivPl7YKywsyxqw Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Am 19.01.22 um 04:16 schrieb "zhilizhao(赵志立)": > > >> On Jan 18, 2022, at 8:52 PM, Thilo Borgmann wrote: >> >> Am 16.01.22 um 12:06 schrieb Nicolas George: >>> Thilo Borgman (12022-01-14): >>>> v6 does: >>>> >>>> $> ffmpeg ... drawtext="fontfile=...:text='%{localtime \:%a %b %d %Y %S}'" (seconds) >>>> $> ffmpeg ... drawtext="fontfile=...:text='%{localtime_ms\:%a %b %d %Y %S}'" (milliseconds) >>>> >>>> I suggest v7 should according to your remark: >>>> >>>> $> ffmpeg ... drawtext="fontfile=...:text='%{localtime \:%a %b %d %Y %S}'" (seconds) >>>> $> ffmpeg ... drawtext="fontfile=...:text='%{localtime \:%a %b %d %Y %S}':show_ms=1" (milliseconds) >>>> >>>> Good? >>> >>> I dislike both versions, from a user interface point of view: if there >>> is a format string, then it stands to reason, for the user, that the >>> resulting text is governed by the format string, not by an extra option >>> somewhere else. >>> >>> There is no "use_four_digit_year=1" option, there is %Y instead of %y. >>> >>> There is no "use_slashes=1" option, you write %Y/%m/%d instead of >>> %Y-%m-%d. >>> >>> There are no "omit_date=1" and "omit_hour=1" options, you just write >>> what you want in the format string. >>> >>> My proposal goes the same way: >>> >>> $> ffmpeg ... drawtext="fontfile=...:text='%{localtime \:%a %b %d %Y %S.%3N}'" >>> >>> It has several merits over your proposal: >>> >>> - It can be extended later to support printing the milliseconds at >>> another place than the end (for example to put the time in brackets). >>> >>> - It can be extended to support microseconds or centiseconds (%6N, %2N). >>> >>> - It is somewhat compatible with GNU date and possibly a few others. >>> >>> And I do not think it is harder to implement. >> >> Ok, did introduce a variable: %[1-6]N >> Parsing and clipping value to valid range of 1-6. >> Default 3. >> >> That way it is position independent and can show any number of decimals from 1 to 6. >> > >> diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c >> index 2a88692cbd..448b174dbb 100644 >> --- a/libavfilter/vf_drawtext.c >> +++ b/libavfilter/vf_drawtext.c >> @@ -51,6 +51,7 @@ >> #include "libavutil/opt.h" >> #include "libavutil/random_seed.h" >> #include "libavutil/parseutils.h" >> +#include "libavutil/time.h" >> #include "libavutil/timecode.h" >> #include "libavutil/time_internal.h" >> #include "libavutil/tree.h" >> @@ -1045,14 +1046,82 @@ static int func_strftime(AVFilterContext *ctx, AVBPrint *bp, >> char *fct, unsigned argc, char **argv, int tag) >> { >> const char *fmt = argc ? argv[0] : "%Y-%m-%d %H:%M:%S"; >> + int64_t unow; >> time_t now; >> struct tm tm; >> - >> - time(&now); >> - if (tag == 'L') >> + char *begin; >> + char *tmp; >> + int len; >> + char *fmt_new; >> + const char *fmt_tmp; >> + int div; >> + >> + unow = av_gettime(); >> + now = unow / 1000000; >> + if (tag == 'L' || tag == 'm') >> localtime_r(&now, &tm); >> else >> tm = *gmtime_r(&now, &tm); >> + >> + // manually parse format for %N (fractional seconds) >> + begin = (char*)fmt; > > Make begin and tmp const char *, so the cast can be removed. > >> + while ((begin = av_stristr(begin, "%"))) { > > How about strstr() since ‘%’ is caseless? > >> + tmp = begin + 1; >> + len = 0; >> + // count digits between % and possible N >> + while (*tmp != '\0' && av_isdigit((int)*tmp)) { >> + len++; >> + tmp++; >> + } >> + // N encountered, insert time >> + if (*tmp == 'N') { >> + int num_digits = 3; // default show millisecond [1,6] >> + >> + // if digits given, parse as number in [1,6] >> + if (len > 0) { >> + av_sscanf(begin + 1, "%i", &num_digits); >> + num_digits = av_clip(num_digits, 1, 6); // ensure valid value > > We can ignore len > 1, then the code can be simplified as > > if (len == 1) > num_digits = av_clip(*(begin + 1) - ‘\0’, 1, 6) > > >> + } >> + >> + len += 2; // add % and N to get length of string part >> + >> + switch(num_digits) { >> + case 1: >> + fmt_tmp = "%.*s%01d%s"; >> + div = 100000; >> + break; >> + case 2: >> + fmt_tmp = "%.*s%02d%s"; >> + div = 10000; >> + break; >> + case 3: >> + fmt_tmp = "%.*s%03d%s"; >> + div = 1000; >> + break; >> + case 4: >> + fmt_tmp = "%.*s%04d%s"; >> + div = 100; >> + break; >> + case 5: >> + fmt_tmp = "%.*s%05d%s"; >> + div = 10; >> + break; >> + case 6: >> + fmt_tmp = "%.*s%06d%s"; >> + div = 1; >> + break; >> + } > > The switch-case can be replaced by “%0*d” and pow(10, 6 - num_digits). Indeed, simplified. >> + >> + fmt_new = av_asprintf(fmt_tmp, begin - fmt, fmt, (int)(unow % 1000000) / div, begin + len); >> + if (!fmt_new) >> + return AVERROR(ENOMEM); >> + av_bprint_strftime(bp, fmt_new, &tm); >> + av_freep(&fmt_new); >> + return 0; >> + } >> + begin++; > > Progress faster by taking account of len. As well, also added to skip "%%". >> + } >> + >> av_bprint_strftime(bp, fmt, &tm); >> return 0; >> } >> -- v8 attached. Thanks, Thilo --------------AjMFNWkgx3ivPl7YKywsyxqw Content-Type: text/plain; charset=UTF-8; name="v8-0001-lavfi-drawtext-Add-N-for-drawing-fractions-of-a-s.patch" Content-Disposition: attachment; filename*0="v8-0001-lavfi-drawtext-Add-N-for-drawing-fractions-of-a-s.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyZjQyY2EyM2IzNWE1ZTJlY2VkZmQ2MDIwMzI5OGNmN2RjYWZkYmE1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUaGlsbyBCb3JnbWFubiA8dGhpbG8uYm9yZ21hbm5A bWFpbC5kZT4KRGF0ZTogVGh1LCAyMCBKYW4gMjAyMiAxMzowMjowNSArMDEwMApTdWJqZWN0 OiBbUEFUQ0ggdjhdIGxhdmZpL2RyYXd0ZXh0OiBBZGQgJU4gZm9yIGRyYXdpbmcgZnJhY3Rp b25zIG9mIGEgc2Vjb25kCgpTdWdnZXN0ZWQtQnk6IGZmbXBlZ0BmYi5jb20KLS0tCiBkb2Mv ZmlsdGVycy50ZXhpICAgICAgICAgIHwgIDQgKysrCiBsaWJhdmZpbHRlci92Zl9kcmF3dGV4 dC5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAyIGZp bGVzIGNoYW5nZWQsIDU5IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZG9jL2ZpbHRlcnMudGV4aSBiL2RvYy9maWx0ZXJzLnRleGkKaW5kZXggMDVkNGIx YTU2ZS4uYzM4OTUxMzhlMCAxMDA2NDQKLS0tIGEvZG9jL2ZpbHRlcnMudGV4aQorKysgYi9k b2MvZmlsdGVycy50ZXhpCkBAIC0xMTM3OCwxMCArMTEzNzgsMTQgQEAgSXQgY2FuIGJlIHVz ZWQgdG8gYWRkIHBhZGRpbmcgd2l0aCB6ZXJvcyBmcm9tIHRoZSBsZWZ0LgogQGl0ZW0gZ210 aW1lCiBUaGUgdGltZSBhdCB3aGljaCB0aGUgZmlsdGVyIGlzIHJ1bm5pbmcsIGV4cHJlc3Nl ZCBpbiBVVEMuCiBJdCBjYW4gYWNjZXB0IGFuIGFyZ3VtZW50OiBhIHN0cmZ0aW1lKCkgZm9y bWF0IHN0cmluZy4KK1RoZSBmb3JtYXQgc3RyaW5nIGlzIGV4dGVuZGVkIHRvIHN1cHBvcnQg dGhlIHZhcmlhYmxlIEB2YXJ7JVsxLTZdTn0KK3doaWNoIHByaW50cyBmcmFjdGlvbnMgb2Yg dGhlIHNlY29uZCB3aXRoIG9wdGlvbmFsbHkgc3BlY2lmaWVkIG51bWJlciBvZiBkaWdpdHMu CiAKIEBpdGVtIGxvY2FsdGltZQogVGhlIHRpbWUgYXQgd2hpY2ggdGhlIGZpbHRlciBpcyBy dW5uaW5nLCBleHByZXNzZWQgaW4gdGhlIGxvY2FsIHRpbWUgem9uZS4KIEl0IGNhbiBhY2Nl cHQgYW4gYXJndW1lbnQ6IGEgc3RyZnRpbWUoKSBmb3JtYXQgc3RyaW5nLgorVGhlIGZvcm1h dCBzdHJpbmcgaXMgZXh0ZW5kZWQgdG8gc3VwcG9ydCB0aGUgdmFyaWFibGUgQHZhcnslWzEt Nl1OfQord2hpY2ggcHJpbnRzIGZyYWN0aW9ucyBvZiB0aGUgc2Vjb25kIHdpdGggb3B0aW9u YWxseSBzcGVjaWZpZWQgbnVtYmVyIG9mIGRpZ2l0cy4KIAogQGl0ZW0gbWV0YWRhdGEKIEZy YW1lIG1ldGFkYXRhLiBUYWtlcyBvbmUgb3IgdHdvIGFyZ3VtZW50cy4KZGlmZiAtLWdpdCBh L2xpYmF2ZmlsdGVyL3ZmX2RyYXd0ZXh0LmMgYi9saWJhdmZpbHRlci92Zl9kcmF3dGV4dC5j CmluZGV4IDJhODg2OTJjYmQuLjA2ZDBjNzdjNTUgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVy L3ZmX2RyYXd0ZXh0LmMKKysrIGIvbGliYXZmaWx0ZXIvdmZfZHJhd3RleHQuYwpAQCAtNTEs NiArNTEsNyBAQAogI2luY2x1ZGUgImxpYmF2dXRpbC9vcHQuaCIKICNpbmNsdWRlICJsaWJh dnV0aWwvcmFuZG9tX3NlZWQuaCIKICNpbmNsdWRlICJsaWJhdnV0aWwvcGFyc2V1dGlscy5o IgorI2luY2x1ZGUgImxpYmF2dXRpbC90aW1lLmgiCiAjaW5jbHVkZSAibGliYXZ1dGlsL3Rp bWVjb2RlLmgiCiAjaW5jbHVkZSAibGliYXZ1dGlsL3RpbWVfaW50ZXJuYWwuaCIKICNpbmNs dWRlICJsaWJhdnV0aWwvdHJlZS5oIgpAQCAtMTA0NSwxNCArMTA0Niw2NSBAQCBzdGF0aWMg aW50IGZ1bmNfc3RyZnRpbWUoQVZGaWx0ZXJDb250ZXh0ICpjdHgsIEFWQlByaW50ICpicCwK ICAgICAgICAgICAgICAgICAgICAgICAgICBjaGFyICpmY3QsIHVuc2lnbmVkIGFyZ2MsIGNo YXIgKiphcmd2LCBpbnQgdGFnKQogewogICAgIGNvbnN0IGNoYXIgKmZtdCA9IGFyZ2MgPyBh cmd2WzBdIDogIiVZLSVtLSVkICVIOiVNOiVTIjsKKyAgICBpbnQ2NF90IHVub3c7CiAgICAg dGltZV90IG5vdzsKICAgICBzdHJ1Y3QgdG0gdG07Ci0KLSAgICB0aW1lKCZub3cpOwotICAg IGlmICh0YWcgPT0gJ0wnKQorICAgIGNvbnN0IGNoYXIgKmJlZ2luOworICAgIGNvbnN0IGNo YXIgKnRtcDsKKyAgICBpbnQgbGVuOworICAgIGNoYXIgKmZtdF9uZXc7CisgICAgaW50IGRp djsKKworICAgIHVub3cgPSBhdl9nZXR0aW1lKCk7CisgICAgbm93ICA9IHVub3cgLyAxMDAw MDAwOworICAgIGlmICh0YWcgPT0gJ0wnIHx8IHRhZyA9PSAnbScpCiAgICAgICAgIGxvY2Fs dGltZV9yKCZub3csICZ0bSk7CiAgICAgZWxzZQogICAgICAgICB0bSA9ICpnbXRpbWVfcigm bm93LCAmdG0pOworCisgICAgLy8gbWFudWFsbHkgcGFyc2UgZm9ybWF0IGZvciAlTiAoZnJh Y3Rpb25hbCBzZWNvbmRzKQorICAgIGJlZ2luID0gZm10OworICAgIHdoaWxlICgoYmVnaW4g PSBhdl9zdHJpc3RyKGJlZ2luLCAiJSIpKSkgeworICAgICAgICB0bXAgPSBiZWdpbiArIDE7 CisgICAgICAgIGxlbiA9IDA7CisKKyAgICAgICAgLy8gc2tpcCBlc2NhcGVkICIlJSIKKyAg ICAgICAgaWYgKCp0bXAgPT0gJyUnKSB7CisgICAgICAgICAgICBiZWdpbiA9IHRtcCArIDE7 OworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKworICAgICAgICAvLyBjb3Vu dCBkaWdpdHMgYmV0d2VlbiAlIGFuZCBwb3NzaWJsZSBOCisgICAgICAgIHdoaWxlICgqdG1w ICE9ICdcMCcgJiYgYXZfaXNkaWdpdCgoaW50KSp0bXApKSB7CisgICAgICAgICAgICBsZW4r KzsKKyAgICAgICAgICAgIHRtcCsrOworICAgICAgICB9CisgICAgICAgIC8vIE4gZW5jb3Vu dGVyZWQsIGluc2VydCB0aW1lCisgICAgICAgIGlmICgqdG1wID09ICdOJykgeworICAgICAg ICAgICAgaW50IG51bV9kaWdpdHMgPSAzOyAvLyBkZWZhdWx0IHNob3cgbWlsbGlzZWNvbmQg WzEsNl0KKworICAgICAgICAgICAgLy8gaWYgZGlnaXQgZ2l2ZW4sIGV4cGVjdCBbMSw2XSwg d2FybiAmIGNsYW1wIG90aGVyd2lzZQorICAgICAgICAgICAgaWYgKGxlbiA9PSAxKSB7Cisg ICAgICAgICAgICAgICAgbnVtX2RpZ2l0cyA9IGF2X2NsaXAoKihiZWdpbiArIDEpIC0gJzAn LCAxLCA2KTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAobGVuID4gMSkgeworICAgICAgICAg ICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19XQVJOSU5HLCAiSW52YWxpZCBudW1iZXIgb2Yg ZGVjaW1hbHMgZm9yICUlTiwgdXNpbmcgZGVmYXVsdCBvZiAlaVxuIiwgbnVtX2RpZ2l0cyk7 CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGxlbiArPSAyOyAvLyBhZGQgJSBhbmQg TiB0byBnZXQgbGVuZ3RoIG9mIHN0cmluZyBwYXJ0CisKKyAgICAgICAgICAgIGRpdiA9IHBv dygxMCwgNiAtIG51bV9kaWdpdHMpOworICAgICAgICAgICAgZm10X25ldyA9IGF2X2FzcHJp bnRmKCIlLipzJTAqZCVzIiwgKGludCkoYmVnaW4gLSBmbXQpLCBmbXQsIG51bV9kaWdpdHMs IChpbnQpKHVub3cgJSAxMDAwMDAwKSAvIGRpdiwgYmVnaW4gKyBsZW4pOworCisgICAgICAg ICAgICBpZiAoIWZtdF9uZXcpCisgICAgICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5P TUVNKTsKKyAgICAgICAgICAgIGF2X2JwcmludF9zdHJmdGltZShicCwgZm10X25ldywgJnRt KTsKKyAgICAgICAgICAgIGF2X2ZyZWVwKCZmbXRfbmV3KTsKKyAgICAgICAgICAgIHJldHVy biAwOworICAgICAgICB9CisKKyAgICAgICAgYmVnaW4gPSB0bXAgKyAxOyAKKyAgICB9CisK ICAgICBhdl9icHJpbnRfc3RyZnRpbWUoYnAsIGZtdCwgJnRtKTsKICAgICByZXR1cm4gMDsK IH0KLS0gCjIuMjAuMSAoQXBwbGUgR2l0LTExNykKCg== --------------AjMFNWkgx3ivPl7YKywsyxqw 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". --------------AjMFNWkgx3ivPl7YKywsyxqw--