From patchwork Sat Jul 29 19:27:50 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: 4506 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp601672vsb; Sat, 29 Jul 2017 12:28:32 -0700 (PDT) X-Received: by 10.28.27.23 with SMTP id b23mr3758430wmb.108.1501356512214; Sat, 29 Jul 2017 12:28:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501356512; cv=none; d=google.com; s=arc-20160816; b=cWhr6X1KOSP46bznqI1F1yje3PDhir7ZRaZJruyQAYF9bk8FHqadXrjFTDMAGVgOyl VBmKsw2jwiHvtm8u4ksuHBHKWMuJAR4go3Wz51oWJE7nzd6ZRVmRMaKcDBHJUyBQ0uZJ azbitmdby8rGIapnZKJioDeUIe6pxm0Q6uVKiTlZMMNswlveJSyrVEzGGCBBDkhrIpc9 /hYpQAeER5/lbRQ+TKnsaVx+AKjKGxUq8uLBkRlstXGybnC99zsKThKMSRvGYQZJ1bFe la5WR7eV5hBBlvEG+NlzwcPQw6DfPab2k3dmL6+tq4o7xdRL2ISzUSC9g+9qdhpZBnRo iiqA== 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=snITUD7p97cg0+/3m0jliRXj2H61uFG8R0kKr3Zwq5M=; b=Jd1thdyVeCw01pSRPjGdbDHCewCz1TqBld0b6FxKC0ETyGkJA8HjgC28vbTZFtlEWT biYtvW1lb6zod57Up5SgdHZDpa7xu3YBoskzdGKbCmYCZ2J+cJCapR0DMk/RS8DirjPd bpygZ8OCDX2qEwa6sIn0slCMOK11Wp7gQbBWf5kNYU4pIo37h32Oc/G1LGCIb43gAdmf B3qVdYdDr+crrOvNku98Cdl92gSX09U9AVVYJjLlhim3MatcoMrAGQInPOEhrscDTzPh htDsrNEgbSZvwu2h1wpARc2sup3JS3i4vp40HVcNqwg6wYKuTUJMgy8YDyln7NH9xLUV MlEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.b=faV3vViR; 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 n21si9545416wra.516.2017.07.29.12.28.31; Sat, 29 Jul 2017 12:28:32 -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=faV3vViR; 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 7CFA9689E2E; Sat, 29 Jul 2017 22:28:10 +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 31D59689E0B for ; Sat, 29 Jul 2017 22:28:03 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 9df39cff for ; Sat, 29 Jul 2017 19:27:55 +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=h+A2skJCdp9KbTGqWoPi3TCduGI=; b=faV3vViRUduiqfjK+VX9T7tYRG4G No3PiN8pr1Ha1V5BnKfLPE401uUCM6ldTaH5tRQkMyrOCr80r3D2iY/x3imExtyJ zTS0GufDGRtL0w9zf6a50AJIPjZghEzF5eNIqIvQe5K4Y7Q8ukG7Iy7oPSN/lPZm gqKJ3Jcyz7PTcFQOtoDQX297I/CFY61DOLZAYDh5ySyMqRxErvDvZQM9pPZH/61i UyjksDV3mYH2Y8OLWKROUvAWV6hg6N8IcxouCQJEwuwOGyT0Jx3qzrVxuuJjUH+c iPAQ8Im+WuxnhQSiSg7R0YF8c9ryWwyVsDqPJSMp39MwUm5vBmLqdmR29Q== 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=f 5tkEuM4mCsJtEHMWQcNfyic95BJdAMc/yPCHDnO58Bg0Tf4ffNNKyFBqGwMiLp3p TFtX3v01sSZt0aUwIYrMYdRBJocQ4zpNQE7PVF/SZ8IL6ze4RWdye07sD0YNwIf/ 5x2zPlrabcFLS6Unt3pvTJHsgnSKryfVmltqdX2Y4aYyetfsFfzp+P9c4l4oylf8 kuM++ip84/+iradBdazeMeV4TrJLk4NGWrnqgB0qQN79quiiFDbzLgM6NSGD2+50 nNg4Kuu4Vtxt1x26RxhmgLVeGruCdl7BAxeMGkP+AtgK50yWnGfEoANnzU4npbNx 3d3GPXm71GVOULxlZMUsA== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 5286d2ca; 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:50 +0200 Message-Id: <20170729192751.26379-4-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 4/5] lavc/htmlsubtitles: handle colors starting with many '#' 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 | 4 ++++ tests/ref/fate/sub-srt-badsyntax | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 29f763bee1..2b47c426ee 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -28,6 +28,10 @@ static int html_color_parse(void *log_ctx, const char *str) { uint8_t rgba[4]; + int nb_sharps = 0; + while (str[nb_sharps] == '#') + nb_sharps++; + str += FFMAX(0, nb_sharps - 1); if (av_parse_color(rgba, str, strcspn(str, "\" >"), log_ctx) < 0) return -1; return rgba[0] | rgba[1] << 8 | rgba[2] << 16; diff --git a/tests/ref/fate/sub-srt-badsyntax b/tests/ref/fate/sub-srt-badsyntax index 791e00e691..1561d3f2f2 100644 --- a/tests/ref/fate/sub-srt-badsyntax +++ b/tests/ref/fate/sub-srt-badsyntax @@ -15,7 +15,7 @@ Dialogue: 0,0:01:10.00,0:01:14.50,Default,,0,0,0,,>>> RebelSubTeam <<< Dialogue: 0,0:02:37.75,0:02:43.70,Default,,0,0,0,,{\b1}~ASUKO MARCH!~\N>>:<<\Ntranslation by: cangii\NRetiming by: furransu{\b0} Dialogue: 0,0:03:38.32,0:03:42.78,Default,,0,0,0,,<>\N<> Dialogue: 0,0:04:50.43,0:05:01.03,Default,,0,0,0,,<\Nwww.SeriesSub.com> -Dialogue: 0,0:20:31.85,0:20:56.84,Default,,0,0,0,,\N<<<>>> +Dialogue: 0,0:20:31.85,0:20:56.84,Default,,0,0,0,,{\c&HFFFF&}\N<<<>>>{\c} Dialogue: 0,0:37:59.69,0:38:01.59,Default,,0,0,0,,mint asztalt foglaltatni\Na <<>Le Cirque-ben. Dialogue: 0,0:53:43.78,0:53:45.94,Default,,0,0,0,,<> - he calmed himself. Dialogue: 0,0:53:46.22,0:53:49.09,Default,,0,0,0,,<