virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc/htmlsubtitles: reindent after previous commits

Browse Source
This commit is contained in:
Clément Bœsch
2017-07-29 21:24:34 +02:00
parent 479ab8c3f8
commit 1193301758
1 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
libavcodec/htmlsubtitles.c
View File

@@ -177,8 +177,6 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
} }
} }
// TODO: reindent
if (!av_strcasecmp(tagname, "font")) { if (!av_strcasecmp(tagname, "font")) {
if (tag_close && sptr > 0) { if (tag_close && sptr > 0) {
struct font_tag *cur_tag = &stack[sptr--]; struct font_tag *cur_tag = &stack[sptr--];
@@ -209,48 +207,46 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
*new_tag = stack[sptr++]; *new_tag = stack[sptr++];
while (param) { while (param) {
if (!av_strncasecmp(param, "size=", 5)) { if (!av_strncasecmp(param, "size=", 5)) {
param += 5 + (param[5] == '"'); param += 5 + (param[5] == '"');
if (sscanf(param, "%u", &new_tag->size) == 1) if (sscanf(param, "%u", &new_tag->size) == 1)
av_bprintf(dst, "{\\fs%u}", new_tag->size); av_bprintf(dst, "{\\fs%u}", new_tag->size);
} else if (!av_strncasecmp(param, "color=", 6)) { } else if (!av_strncasecmp(param, "color=", 6)) {
int color; int color;
param += 6 + (param[6] == '"'); param += 6 + (param[6] == '"');
color = html_color_parse(log_ctx, param); color = html_color_parse(log_ctx, param);
if (color >= 0) { if (color >= 0) {
new_tag->color = 0xff000000 | color; new_tag->color = 0xff000000 | color;
av_bprintf(dst, "{\\c&H%X&}", new_tag->color & 0xffffff); av_bprintf(dst, "{\\c&H%X&}", new_tag->color & 0xffffff);
}
} else if (!av_strncasecmp(param, "face=", 5)) {
param += 5 + (param[5] == '"');
len = strcspn(param,
param[-1] == '"' ? "\"" :" ");
av_strlcpy(new_tag->face, param,
FFMIN(sizeof(new_tag->face), len+1));
param += len;
av_bprintf(dst, "{\\fn%s}", new_tag->face);
} }
if ((param = strchr(param, ' '))) } else if (!av_strncasecmp(param, "face=", 5)) {
param++; param += 5 + (param[5] == '"');
len = strcspn(param,
param[-1] == '"' ? "\"" :" ");
av_strlcpy(new_tag->face, param,
FFMIN(sizeof(new_tag->face), len+1));
param += len;
av_bprintf(dst, "{\\fn%s}", new_tag->face);
} }
if ((param = strchr(param, ' ')))
param++;
} }
}
in += skip; in += skip;
} else if (tagname[0] && !tagname[1] && strchr("bisu", av_tolower(tagname[0]))) {
} else if (tagname[0] && !tagname[1] && strchr("bisu", av_tolower(tagname[0]))) { av_bprintf(dst, "{\\%c%d}", (char)av_tolower(tagname[0]), !tag_close);
av_bprintf(dst, "{\\%c%d}", (char)av_tolower(tagname[0]), !tag_close); in += skip;
in += skip; } else if (!av_strncasecmp(tagname, "br", 2) &&
} else if (!av_strncasecmp(tagname, "br", 2) && (!tagname[2] || (tagname[2] == '/' && !tagname[3]))) {
(!tagname[2] || (tagname[2] == '/' && !tagname[3]))) { av_bprintf(dst, "\\N");
av_bprintf(dst, "\\N"); in += skip;
in += skip; } else if (likely_a_tag) {
} else if (likely_a_tag) { if (!tag_close) // warn only once
if (!tag_close) // warn only once av_log(log_ctx, AV_LOG_WARNING, "Unrecognized tag %s\n", tagname);
av_log(log_ctx, AV_LOG_WARNING, "Unrecognized tag %s\n", tagname); in += skip;
in += skip; } else {
} else { av_bprint_chars(dst, '<', 1);
av_bprint_chars(dst, '<', 1);
} }
} else { } else {
av_bprint_chars(dst, *in, 1); av_bprint_chars(dst, *in, 1);