From patchwork Fri Jun 16 11:26:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: DongHoon Kang X-Patchwork-Id: 3998 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1239945vsw; Fri, 16 Jun 2017 04:34:58 -0700 (PDT) X-Received: by 10.28.136.196 with SMTP id k187mr7080684wmd.103.1497612898323; Fri, 16 Jun 2017 04:34:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497612898; cv=none; d=google.com; s=arc-20160816; b=ErvED92FZdXfyEaAPwV86/J73uxeS3c60YjkLmUlQ4LXU+VLAjrOgQ1DAFGdfTUlcw 33aCxKL7DnjGGOo9DsshlD4gAjYZL1z/Ize0TRWLWRlpNze8ex6UxT9qDkzj31FX7umG Q0iquIk2rqFE8P/e143pSZuNX6tInQPmvDbFSUoe5drf0QlLKSK5VKUyQl0x8fwkR2mc ICNrHmQhwOy12GaZrt2LwaMRJGLv/4WoTn2p/8Eh3d5wHe+jp6yjV3ZaUqBNex/gcKsa URtqLcIZwq5adcV1WuB3KdTfeKqktDcVWQ78ZfA1jOJlM+JdeIxAK71r112e4FHPZYBy 2urg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=2lX3iM0dnRYOIxt8I35qYqLHbPZCBnACkNo9hufE7Dc=; b=uBqtxVcdFI9MVrHrBKZDctiRXHB92LiUh0oazrxqEYXBtIlRKOs1MdcdgWaRgpOjzN 9qm2KpT/DT4eq3tWUyourhNwcBDkR+ozVeUZqqiRB8Tk+QbBjxc9T4lM6QcEXairFcs0 a/3ebG2pZyrDWgPQyph3+UTH0TDA9dNXbHInpc08pfwXw7rqKIi4qTltfKivc3s3QAIM 3tDvCSjsp+ydx3oAAf4t4UCO4ztpRlIXcCrZkVN9la68sxPmdmQG6uXWeJmGaAwps6/e TO5YR1LAFUqklfXIpT3e4zv7myh0TWjcUN3gp02CVNBPct+j8CD60frN6Mh/mtjZmi4W 13ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=omiQ2c4r; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 54si2049824wrw.341.2017.06.16.04.34.57; Fri, 16 Jun 2017 04:34:58 -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=@gmail.com header.b=omiQ2c4r; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C1C8268A176; Fri, 16 Jun 2017 14:34:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CFE068A157 for ; Fri, 16 Jun 2017 14:34:45 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id u62so83198pgb.0 for ; Fri, 16 Jun 2017 04:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=6IzSYF4Blx5UfAhy5zKemu21/yV+Exg+Zn+Y1R2c6mo=; b=omiQ2c4r+ju6/2jUo8F19ppJbsgVLll943TFKlBt0Rd/FCpfo8esSgJcU23Pv6CvIe Tjdixip+CHq5ratXz+xIQzF+KVfF4ZXfdYFLj6bzQk2NfoA4qNkutFs8kJwLPXg7IspD QY55L9Ji7TdCiTGNDcLgh9Q8iGHPYkbfBdSb3IuWr0mupm1Rx6w/7AeibrxtcgOSmZI2 AvQLud79gXgKKqIbSLghdNt4Lvh1SY51Wk2DxmDffSPwFABk483B4pPNKNaPrypuNAKg 9/Gxr0rKhCjEPbvACvrPb688rd+BTlVaN1tSD3r1KOdgte2p8AKRakNwyoCDGnYY4QBn lBOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6IzSYF4Blx5UfAhy5zKemu21/yV+Exg+Zn+Y1R2c6mo=; b=PTYOSlWjt7rwkpeVf7DwjVyjlEjf/3ov9h6ynAOapeEIm/IvV0KAn8/wc0WsnOyfvu xv+AN7KdVBEx38aYGhp3eDYOTWSOjd+azQNbMPEWQ9L4OJEz78fCncTJ1Y4Ii3n/7Y6X EWAKi9/iwakIr0zH/4B9hXl9kspXbCwz9GK7KEGc/t5Ll+t15+/sFTrlINq6m3B7NIj2 /fNhWByTi9B54LyzY606mzWGo4r829V2oSFnQVgtf2vHVc5PqEnKjlrw74xkAKMI5eET HLcFr7pUWqzCivJEULspDAW3nbFAJVdQ/t9XGVP2igN0YbXzxjsw2A0zrruf2T9GifpI zJXg== X-Gm-Message-State: AKS2vOyY9tCHUHqa01nGYg9ZCAINnYk+CTpneT3COC9hLSkHMSJKdm/4 RKvcKRQeYt2k9itS X-Received: by 10.84.193.129 with SMTP id f1mr12347070pld.129.1497612459572; Fri, 16 Jun 2017 04:27:39 -0700 (PDT) Received: from localhost.localdomain ([60.253.2.78]) by smtp.gmail.com with ESMTPSA id f8sm4545161pfc.14.2017.06.16.04.27.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 04:27:39 -0700 (PDT) From: DongHoon Kang To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2017 20:26:37 +0900 Message-Id: <20170616112637.14535-1-nanuda.kang@gmail.com> X-Mailer: git-send-email 2.13.1 Subject: [FFmpeg-devel] [PATCH] libavcodec/htmlsubtitles.c: make tags case-insensitive 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: DongHoon Kang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: DongHoon Kang --- libavcodec/htmlsubtitles.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) tags in srt and sami subtitles don't need to be in lowercase. diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 16295daa0c..94430f7345 100644 --- a/libavcodec/htmlsubtitles.c +++ b/libavcodec/htmlsubtitles.c @@ -99,12 +99,12 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) if ((param = strchr(tagname, ' '))) *param++ = 0; if ((!tag_close && sptr < FF_ARRAY_ELEMS(stack)) || - ( tag_close && sptr > 0 && !strcmp(stack[sptr-1].tag, tagname))) { + ( tag_close && sptr > 0 && !av_strcasecmp(stack[sptr-1].tag, tagname))) { int i, j, unknown = 0; in += len + tag_close; if (!tag_close) memset(stack+sptr, 0, sizeof(*stack)); - if (!strcmp(tagname, "font")) { + if (!av_strcasecmp(tagname, "font")) { if (tag_close) { for (i=PARAM_NUMBER-1; i>=0; i--) if (stack[sptr-1].param[i][0]) @@ -115,7 +115,7 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) } } else { while (param) { - if (!strncmp(param, "size=", 5)) { + if (!av_strncasecmp(param, "size=", 5)) { unsigned font_size; param += 5 + (param[5] == '"'); if (sscanf(param, "%u", &font_size) == 1) { @@ -123,13 +123,13 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) sizeof(stack[0].param[PARAM_SIZE]), "{\\fs%u}", font_size); } - } else if (!strncmp(param, "color=", 6)) { + } else if (!av_strncasecmp(param, "color=", 6)) { param += 6 + (param[6] == '"'); snprintf(stack[sptr].param[PARAM_COLOR], sizeof(stack[0].param[PARAM_COLOR]), "{\\c&H%X&}", html_color_parse(log_ctx, param)); - } else if (!strncmp(param, "face=", 5)) { + } else if (!av_strncasecmp(param, "face=", 5)) { param += 5 + (param[5] == '"'); len = strcspn(param, param[-1] == '"' ? "\"" :" "); @@ -147,8 +147,8 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in) if (stack[sptr].param[i][0]) av_bprintf(dst, "%s", stack[sptr].param[i]); } - } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) { - av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close); + } else if (tagname[0] && !tagname[1] && av_stristr("bisu", tagname)) { + av_bprintf(dst, "{\\%c%d}", (char)av_tolower(tagname[0]), !tag_close); } else { unknown = 1; snprintf(tmp, sizeof(tmp), "", tagname);