[FFmpeg-devel] libavcodec/htmlsubtitles.c: make tags case-insensitive

Submitted by DongHoon Kang on June 16, 2017, 11:26 a.m.

Details

Message ID 20170616112637.14535-1-nanuda.kang@gmail.com
State New
Headers show

Commit Message

DongHoon Kang June 16, 2017, 11:26 a.m.
Signed-off-by: DongHoon Kang <nanuda.kang@gmail.com>
---
 libavcodec/htmlsubtitles.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

tags in srt and sami subtitles don't need to be in lowercase.

Comments

Clément Bœsch July 7, 2017, 10:04 a.m.
On Fri, Jun 16, 2017 at 08:26:37PM +0900, DongHoon Kang wrote:
> Signed-off-by: DongHoon Kang <nanuda.kang@gmail.com>
> ---
>  libavcodec/htmlsubtitles.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 

Rebased, updated for recent <br> change, and applied.

Sorry for the delay, and thanks for the patch.

Regards,

[...]

Patch hide | download patch | download mbox

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), "</%s>", tagname);