From patchwork Sat Jul 29 19:27:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 4508 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp601552vsb; Sat, 29 Jul 2017 12:28:23 -0700 (PDT) X-Received: by 10.223.176.148 with SMTP id i20mr8296007wra.165.1501356503705; Sat, 29 Jul 2017 12:28:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501356503; cv=none; d=google.com; s=arc-20160816; b=OI2O61YLFF3f3G2m6ZVUkHJbuWewvFbl11PC9DBn9569DJwAs0ewe8HKhATyWzKgsn Pt8pj7gpS2ykL2rBYvw9hdgw/3emG/1FfcsScPtJiapWJSvrswSHRR3JpMtluMuwdD15 JEZXahkMG+sr+ZJXNttFSm/QJznMYji+EMn8nYtt3MfL4mMrJEM9pljGqF0nfv588579 SNOEi8txfBrJvQqmd4c6d4sQcwjnKwLYAx1SJ+XYbv5P6c760JQ5EIBiU3zmqzp8e5mq S+lL1nCV4Oj5adqWd93bZfe3OY/dFgKMDhLaqdAAneYQzjGHQuJYDz4tM4DBCi1lb21V wSbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:domainkey-signature:dkim-signature:delivered-to :arc-authentication-results; bh=XHI1I78Uu58M8WQNxIoFnPct0pfmZsBXJxNm2W7cJyM=; b=ykm5uvsfUmeYDqa8hem43EiFiZDR3MaKsUvaTRmc9qHXqoUPy4kbkXi2x3qHs84SFD CnZOyVjrd+ApXZqDYnmLO/yXbTunmQ6sD1af1Y4xxW8xb9CDTrP6LmvFnbGTVqsGvHHb RTn2bknl1HgpsIlV5faARB3R3+aojlg+pEIUlcKRURXRhrk7DmK52ghw2NEpj6LXnFI6 CfgzEUTrgg9sRb1SJTmZt+1OhLqhe8KsEDXfyIUk3+KjBFEiaDsLp0zfB140pWCfy8uq altyd6rvLGiFcVaWD9Iy4OA9f/zS7a3q3rzPrPIP1BipQFk3Riwo5sb2Vfre69QtRBJu MblA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.b=oHCdIp5T; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a141si5684930wma.43.2017.07.29.12.28.23; Sat, 29 Jul 2017 12:28:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.b=oHCdIp5T; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1355B689E1F; Sat, 29 Jul 2017 22:28:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 158B5689E12 for ; Sat, 29 Jul 2017 22:28:02 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 219c989a for ; Sat, 29 Jul 2017 19:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references; s=selector1; bh=h5LNEKjBxv5Mv1/ha0ac7AmTl+o=; b=oHCdIp5Tlm0l/rhsSQsjNCUM1dM8 wGFolWyx++aE0r6U+ujhZi/iuxtDwbqhofhiXUGastisSlEWsipdTIWsFHHoV8ct 9KH4a+s58zS4rQxxM7aEWf77nwhqjJHjyZ0XNrlHDyhJ/VQpHiiMpgLT/WwvtVC9 1EeRtYBojvo7v5vz8wILDkh8/xBRhJhSv5YwVufgeb6wp+HmJb/GYOhUWb7B5ZoB jPQS1vyb/H6mMCAHcLE/vydva2Dq277jZ0obtmBbm9cQIXhjb4uCfdUAd96hldGu 7x3+MM6cjPmhA1VbPmMrd32zHGwW8WtiJLA8UiqECz3mh9VJUT7M7b98UA== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references; q=dns; s=selector1; b=M aoNrZ/1o4SlSPfRLbOc7xUsUxLUEpRVgcldRaFZk1jEQqLLThSxZra6+J+4327Ib j8RS5gslQGVZFsOe9WFhUg3i9cXyefkcCs8sLbPve46DEapX9iQ/6Oea6I0LIlJN HOAUtjUyS3lb9tP+mbOR5pn/YHDCokEGYNQJF7/X2Z4oaseNswCPVqn33p3XxNSk 7j4XGx+bLFekdJ/Rj1VHzNqBSUpdShWCZo8PyqV+xq6wzCXmg752+SP/1lFZ1Rfi IPWCTp6lT6E4FaMPmVQvlutuz4v4YIqIQlNKYf9YVfC1VLqN8u6DDsNm0BJVSwVa gC1KxJjyGXCD9L1cUjp+w== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id d39727b0; Sat, 29 Jul 2017 19:27:53 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 29 Jul 2017 21:27:49 +0200 Message-Id: <20170729192751.26379-3-u@pkh.me> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170729192751.26379-1-u@pkh.me> References: <20170729192751.26379-1-u@pkh.me> Subject: [FFmpeg-devel] [PATCH 3/5] lavc/htmlsubtitles: improve line breaks handling X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/htmlsubtitles.c | 5 +++-- libavcodec/tests/htmlsubtitles.c | 2 ++ tests/ref/fate/libavcodec-htmlsubtitles | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 69d855df21..29f763bee1 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -163,7 +163,7 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) #define LIKELY_A_TAG_CHAR(x) (((x) >= '0' && (x) <= '9') || \ ((x) >= 'a' && (x) <= 'z') || \ ((x) >= 'A' && (x) <= 'Z') || \ - (x) == '_') + (x) == '_' || (x) == '/') for (i = 0; tagname[i]; i++) { if (!LIKELY_A_TAG_CHAR(tagname[i])) { likely_a_tag = 0; @@ -235,7 +235,8 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) } else if (tagname[0] && !tagname[1] && strchr("bisu", av_tolower(tagname[0]))) { av_bprintf(dst, "{\\%c%d}", (char)av_tolower(tagname[0]), !tag_close); in += skip; - } else if (!av_strcasecmp(tagname, "br")) { + } else if (!av_strncasecmp(tagname, "br", 2) && + (!tagname[2] || (tagname[2] == '/' && !tagname[3]))) { av_bprintf(dst, "\\N"); in += skip; } else if (likely_a_tag) { diff --git a/libavcodec/tests/htmlsubtitles.c b/libavcodec/tests/htmlsubtitles.c index d0b55a45d3..7c89ee97af 100644 --- a/libavcodec/tests/htmlsubtitles.c +++ b/libavcodec/tests/htmlsubtitles.c @@ -29,6 +29,8 @@ static const char * const test_cases[] = { "Foo ", // not a tag (not alnum) " foo bar bla ", // broken nesting + + "A
B
C
D< Br >E", // misc line breaks }; int main(void) diff --git a/tests/ref/fate/libavcodec-htmlsubtitles b/tests/ref/fate/libavcodec-htmlsubtitles index 702f0b7ea3..66dd8e8d48 100644 --- a/tests/ref/fate/libavcodec-htmlsubtitles +++ b/tests/ref/fate/libavcodec-htmlsubtitles @@ -5,3 +5,4 @@ < font color=red >red --> {\c&HFF&}red{\c} Foo --> Foo foo bar bla --> {\b1} foo {\i1} bar {\b0} bla {\i0} +A
B
C
D< Br >E --> A\NB\NC\ND\NE