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 8B3BA4103D
for <ffmpegdev@gitmailbox.com>; Fri, 21 Mar 2025 15:58:53 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCBFF687C06;
Fri, 21 Mar 2025 17:58:49 +0200 (EET)
Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com
[209.85.208.48])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76DD4687BED
for <ffmpeg-devel@ffmpeg.org>; Fri, 21 Mar 2025 17:58:43 +0200 (EET)
Received: by mail-ed1-f48.google.com with SMTP id
4fb4d7f45d1cf-5e5cded3e2eso3055235a12.0
for <ffmpeg-devel@ffmpeg.org>; Fri, 21 Mar 2025 08:58:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742572722; x=1743177522; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=yBOI/me3JFkfBeFSjj2cVXhN3ATDMs+cuOmUGJHlGVs=;
b=fvsyKvQn21gWbgsxtousK4Tk+ZDXqfRBJ2SBUxDdzs42RbgwNRURuQU1DAmUVMeyrW
Wsl0JQlRO28lfVaqeAOWWxb6CmHCdALaa4o2G8reTRzFBZyy//F85VKZk5SXQSMnJDAY
5Q1B5B2AoVDx+ql75qpKnDuxLEe6hM65icW5BfPEpoS8uxJ8K20uDmsPbpKO/KAMNr6Y
xn/gaZuFf5Bhzc8CliysYndueuPa+knOEaWClp9DindRgXv80yuu+CV+nuZq7CKSVg6s
NpiGhlgZbCTVOnCdibovJlC9Z1oslCVSRt09EysNr4VrKobS8HHKHWQU/v813ewIX0T1
tQxg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742572722; x=1743177522;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=yBOI/me3JFkfBeFSjj2cVXhN3ATDMs+cuOmUGJHlGVs=;
b=NBS9vTPHdZ+y/02JjS7pl06YnKQ11cgkg0orw/m9qftjgYIqwOvbquUlxjSmS5V417
QfyOnffGZLTliJPgidaRtuq1BPqlD85lcnd7ZbqWrEqUCyii4b9W90RFA8GJb0xDlR0d
Z3k2a8aUqZ/VTCoxSYIYBAMM5W+6EheTG5E5Elf5PzvEBsUidfiMsBuGx1LMc8u7NACG
o9I9sLlO2hMiEuP35dnfAgFenQ6biyQcyp7hC887eUtKbUUMGlN15FOa/YBgKWkBGZvK
9wPzt4rNmAd1gdE0sGEjaqzvfsT73+aN+ckC0XTn7et/xN5EXbN72MgKtfA0xTeAK3fY
MNHg==
X-Gm-Message-State: AOJu0YzLcgD4CytYEkTGJCKY6hC783YWtKjY56omXtVOy437cba6FGGM
3hIp6h9c4PzB1yiL00J3MNlmfyZFJ2jyzoeea5cS8esApB7GNP1UFYUjgg==
X-Gm-Gg: ASbGncvF57UmPjs626pnSRtcqCtQq3RLxyiFYYQ5njniqxC8uIrvBHKpxlClgxbyhHE
7pTt8a4DgkYx3qq7WHcEbLMKQ3DuJhnIx7l8fIf0FqG33YsAqQ2T+oWUpbHSZmDvOsaC+usDzyu
MNKmgYFpWPgVSFPR0XHyAFCMc80lI2Z5aVDPrGiGOe8nT+KnIKlGEFTo8HWJivkKYk9ISUtyfaR
Q5nGQRhFAOtE1xvZqZa7oJYW3UwcFTM+DU7WSm4QEbfBg/szFtZrjxa5rCVWRciMSsnHfRIPQBl
bs4lHWagKLMLu+DLXLbUtLCCjBaFIX3R0ljYHZG0V1wetK08AGf9vqTUPETP
X-Google-Smtp-Source: AGHT+IEpCJqGJo1SJzX8oHTd+7TC7e4YpG0+eF+LlI0XDYBckbY0Qp0KmHOoMmV40SZlkzmvs5nnDg==
X-Received: by 2002:a05:6402:50c6:b0:5e0:82a0:50dd with SMTP id
4fb4d7f45d1cf-5ebcd531565mr3548577a12.27.1742572722076;
Fri, 21 Mar 2025 08:58:42 -0700 (PDT)
Received: from skoolleptop.home ([188.90.220.200])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5ebccf84616sm1568289a12.22.2025.03.21.08.58.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 21 Mar 2025 08:58:41 -0700 (PDT)
From: Leon Grutters <gruttersleonbot2@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 21 Mar 2025 16:55:02 +0100
Message-ID: <20250321155502.418939-1-gruttersleonbot2@gmail.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v2] 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>
Cc: Leon Grutters <gruttersleonbot2@gmail.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/20250321155502.418939-1-gruttersleonbot2@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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 | 39 ++++++++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c
index 733fdee685..c375867643 100644
--- a/libavcodec/webvttdec.c
+++ b/libavcodec/webvttdec.c
@@ -34,20 +34,41 @@ 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[6];
+ const char to[6];
+} webvtt_valid_tags[] = {
+ {"i", "{\\i1}"}, {"/i", "{\\i0}"},
+ {"b", "{\\b1}"}, {"/b", "{\\b0}"},
+ {"u", "{\\u1}"}, {"/u", "{\\u0}"},
+};
static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
{
- int i, again = 0, skip = 0;
+ int i, again = 0;
while (*p) {
+ if (*p == '<') {
+ const char *tag_end = strchr(p, '>');
+ ptrdiff_t len;
+ if (!tag_end)
+ break;
+ len = tag_end - p + 1;
+ for (i = 0; i < FF_ARRAY_ELEMS(webvtt_valid_tags); i++) {
+ const char *from = webvtt_valid_tags[i].from;
+ if(!strncmp(p + 1, from, strlen(from))) {
+ av_bprintf(buf, "%s", webvtt_valid_tags[i].to);
+ break;
+ }
+ }
+ p += len;
+ again = 1;
+ }
for (i = 0; i < FF_ARRAY_ELEMS(webvtt_tag_replace); i++) {
const char *from = webvtt_tag_replace[i].from;
@@ -59,21 +80,17 @@ static int webvtt_event_to_ass(AVBPrint *buf, const char *p)
break;
}
}
+
if (!*p)
break;
if (again) {
again = 0;
- skip = 0;
continue;
}
- if (*p == '<')
- skip = 1;
- else if (*p == '>')
- skip = 0;
- else if (p[0] == '\n' && p[1])
+ if (p[0] == '\n' && p[1])
av_bprintf(buf, "\\N");
- else if (!skip && *p != '\r')
+ else if (*p != '\r')
av_bprint_chars(buf, *p, 1);
p++;
}
--
2.49.0
_______________________________________________
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".