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 7066246973
for <ffmpegdev@gitmailbox.com>; Thu, 20 Mar 2025 18:16:24 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD883687BB9;
Thu, 20 Mar 2025 20:16:20 +0200 (EET)
Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com
[209.85.208.45])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3A8F6879D0
for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Mar 2025 20:16:14 +0200 (EET)
Received: by mail-ed1-f45.google.com with SMTP id
4fb4d7f45d1cf-5e5e0caa151so2037105a12.0
for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Mar 2025 11:16:14 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742494574; x=1743099374; darn=ffmpeg.org;
h=content-transfer-encoding:in-reply-to:content-language:references
:to:subject:from:user-agent:mime-version:date:message-id:from:to:cc
:subject:date:message-id:reply-to;
bh=kP2Ek4B2ehIxZrUX4CJPBFD49TLYejmk54BF6EOolP8=;
b=XH1fbRzGdozXyu4jZRqsp2GbJEfd5ab3Y+NOnhBMdygetxz+ppAVi42dX86X0Iqd0+
eceMvvj3e55ohjZOy068eY4i+rgXJXmt97Z6iTMGCQb1Aa+MvFduv9YTSSL0+ofCkrvV
gtcCjXWPbDQysCGXC7GvBm3cPzRVqEYLts3x3oGl1PhevE+CHgEQOZJeNz3akZ4qk5vd
5FDs6SVajxtgYq8BKVk6AewCWY7cewrg2C0P5mbTYrszvAxgsxr8kBTp2r7Aa3fHwYu6
bWtRNOkTKBrOuSlIXDN4KW9WrilGbTxY22+DMljoIaVYvENmerUNTnUsT/NjlkMeFeCG
mojw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742494574; x=1743099374;
h=content-transfer-encoding:in-reply-to:content-language:references
:to:subject:from:user-agent:mime-version:date:message-id
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=kP2Ek4B2ehIxZrUX4CJPBFD49TLYejmk54BF6EOolP8=;
b=H0UI3c2ckerdAlaO7AkUBDa4Wx0I12ByyxgNlda/Bb7gNI1/thbpGqLrEBfvU7PJHj
LRPdJrMxO/QpICYQjS+TRc8uNE0QQj2RwJV/OFkaNWf2D6C9ymDykv5230ltZIAVZClg
QPs2kxFgsvWq/EhaCNU2JwSPplQgS5HTYQ/n0fqK4ldcYRmA+dmJFf+qk3jhc+uW6Imo
JV53DG1CFiXTlOUfwzeiVe9TBY45/uheeNED2UsJPmrvajx4+fWmWj1HlW5dNoKmmY9M
wHiaZAOIWxJxI2thMDW8JtQO8LG2wjupP1RwNmqZghxgi1gq5htMSTdwmBM7ooeOru+M
Eitw==
X-Gm-Message-State: AOJu0YwhWja+iBBUfUELIRtoE9c/8R3mKLcH1jtjfeqS4V4wmJgQkaLc
oOEPfTokR8zX6Ij0HNADUrnf9JteIuM+5Kz5AbKG8btd7EqyAwOxxozUPg==
X-Gm-Gg: ASbGncsqnjL/H3WwLOQ+1s2oexHdDNIdG9ZvJe8tcl4K2yVnGuB+FKH6PlLUQ++w/3k
/MnFB5kpQdXOHL8uR8hpEhWYLG00PMgf/YXSLz3DG5R1iNaIIsGOqAk9mTz6zNWB/5pKWnWF985
03ZbrJnyK4Ie51+6lBx2JHaxEdur+jMqgj6TBqMzYdGCbE7IeAhFJL4qdBeh8RVnJJPd1ovB45U
SM7LGPv5BXdSI8CCLC1tgqXI41aojOUl88JqPoWQ7sZPHm0umPdGo2++pGzPywxN5CjBaDEaKov
1HLP6qvujW5dTouDPqJ/AjZeuQU9eFvM5aNdxfHvEDFk3c+kvKSu9DPN0Bc=
X-Google-Smtp-Source: AGHT+IHjLuSFdJLK5vTM0lOwK/74UQiz/3r/VUfjPt80SoVyBSQ+1qefy9K0VL7ROJkdSvygDHRnqQ==
X-Received: by 2002:a05:6402:27c7:b0:5e0:9269:f54e with SMTP id
4fb4d7f45d1cf-5ebcd434462mr318972a12.14.1742494573377;
Thu, 20 Mar 2025 11:16:13 -0700 (PDT)
Received: from [192.168.1.145] ([188.90.220.200])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5ebccfae189sm132247a12.37.2025.03.20.11.16.12
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Thu, 20 Mar 2025 11:16:13 -0700 (PDT)
Message-ID: <a5565b86-b64c-4699-8142-c2eaa9bae8d8@gmail.com>
Date: Thu, 20 Mar 2025 19:16:12 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Leon Grutters <gruttersleonbot2@gmail.com>
To: ffmpeg-devel@ffmpeg.org
References: <20250320072450.1164-1-gruttersleonbot2@gmail.com>
<DU0P250MB074785FBAC352DECD4E31FB88FD82@DU0P250MB0747.EURP250.PROD.OUTLOOK.COM>
Content-Language: en-US
In-Reply-To: <DU0P250MB074785FBAC352DECD4E31FB88FD82@DU0P250MB0747.EURP250.PROD.OUTLOOK.COM>
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/webvttdec: strip classes
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>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/a5565b86-b64c-4699-8142-c2eaa9bae8d8@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
On 3/20/25 9:02 AM, Andreas Rheinhardt wrote:
> Leon Grutters:
>> If a supported tag has a class, e.g "<i.bold>" it is ignored entirely;
>> so for example "<i.bold>Hello</i>" would be converted to "Hello{\i0}"
>> instead of the intended "{\i1}Hello{\i0}".
>>
>> Signed-off-by: Leon Grutters<gruttersleonbot2@gmail.com>
>> ---
>> libavcodec/webvttdec.c | 51 +++++++++++++++++++++++++++++++++---------
>> 1 file changed, 40 insertions(+), 11 deletions(-)
>>
>> diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c
>> index 35bdbe805d..4111d138c4 100644
>> --- a/libavcodec/webvttdec.c
>> +++ b/libavcodec/webvttdec.c
>> @@ -29,25 +29,53 @@
>> #include "ass.h"
>> #include "codec_internal.h"
>> #include "libavutil/bprint.h"
>> +#include "libavutil/mem.h"
>>
>> static const struct {
>> const char *from;
>> const char *to;
>> } webvtt_tag_replace[] = {
>> - {"<i>", "{\\i1}"}, {"</i>", "{\\i0}"},
>> - {"<b>", "{\\b1}"}, {"</b>", "{\\b0}"},
>> - {"<u>", "{\\u1}"}, {"</u>", "{\\u0}"},
>> {"{", "\\{{}"}, {"\\", "\\\xe2\x81\xa0"}, // escape to avoid ASS markup conflicts
>> {">", ">"}, {"<", "<"},
>> {"‎", "\xe2\x80\x8e"}, {"‏", "\xe2\x80\x8f"},
>> {"&", "&"}, {" ", "\\h"},
>> };
>> +static const struct {
>> + const char *from;
>> + const char *to;
>> +} webvtt_valid_tags[] = {
>> + {"i", "{\\i1}"}, {"/i", "{\\i0}"},
>> + {"b", "{\\b1}"}, {"/b", "{\\b0}"},
>> + {"u", "{\\u1}"}, {"/u", "{\\u0}"},
>> +};
> These strings are so small that one can avoid the relocations by using
> fixes-size buffers.
What do you mean exactly? I'm not sure I understand.
>>
>> static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
>> {
>> - int i, again = 0, skip = 0;
>> + int i, again = 0/*, skip = 0*/;
>>
>> while (*p) {
>> + if (*p == '<') {
>> + const char *tag_end = strchr(p, '>');
>> + char *tag_body, *tag_name, *saveptr = NULL;
>> + ptrdiff_t len;
>> + if (!tag_end)
>> + break;
>> + len = tag_end - p + 1;
>> + tag_body = av_strndup(p + 1, len - 2);
>> + if (!tag_body)
>> + return AVERROR(ENOMEM);
> This allocation seems unnecessary. You can inspect the string without
> modifying it by using strncmp() below and by using a maximum field width
> for the %s directive in a parameter.
My thought process here was that if it's done this way, you have saveptr
for possibly getting the classes (and tag annotation) later on.
>> + tag_name = av_strtok(tag_body, ".", &saveptr);
>> + for (i = 0; i < FF_ARRAY_ELEMS(webvtt_valid_tags); i++) {
>> + const char *from = webvtt_valid_tags[i].from;
>> + if(!strcmp(tag_name, from)) {
>> + av_bprintf(buf, "%s", webvtt_valid_tags[i].to);
>> + break;
>> + }
>> + }
>> + p += len;
>> + again = 1;
>> + av_freep(&tag_body);
>> + }
>>
>> for (i = 0; i < FF_ARRAY_ELEMS(webvtt_tag_replace); i++) {
>> const char *from = webvtt_tag_replace[i].from;
>> @@ -59,21 +87,22 @@ static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
>> break;
>> }
>> }
>> +
>> if (!*p)
>> break;
>>
>> if (again) {
>> again = 0;
>> - skip = 0;
>> + // skip = 0;
>> continue;
>> }
>> - if (*p == '<')
>> - skip = 1;
>> - else if (*p == '>')
>> - skip = 0;
>> - else if (p[0] == '\n' && p[1])
>> + // if (*p == '<')
>> + // skip = 1;
>> + // else if (*p == '>')
>> + // skip = 0;
>> + if (p[0] == '\n' && p[1])
>> av_bprintf(buf, "\\N");
>> - else if (!skip && *p != '\r')
>> + else if (/*!skip && */*p != '\r')
>> av_bprint_chars(buf, *p, 1);
>> p++;
>> }
_______________________________________________
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".