mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/htmlsubtitles: Factor open brace handling into its own function
Suggested-by: wm4 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
4132218b87
commit
14b834c45a
|
@ -51,6 +51,30 @@ static void rstrip_spaces_buf(AVBPrint *buf)
|
||||||
buf->str[--buf->len] = 0;
|
buf->str[--buf->len] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* skip all {\xxx} substrings except for {\an%d}
|
||||||
|
and all microdvd like styles such as {Y:xxx} */
|
||||||
|
static void handle_open_brace(AVBPrint *dst, const char **inp, int *an, int *closing_brace_missing)
|
||||||
|
{
|
||||||
|
int len = 0;
|
||||||
|
const char *in = *inp;
|
||||||
|
|
||||||
|
*an += sscanf(in, "{\\an%*1u}%n", &len) >= 0 && len > 0;
|
||||||
|
|
||||||
|
if (!*closing_brace_missing) {
|
||||||
|
if ( (*an != 1 && in[1] == '\\')
|
||||||
|
|| (in[1] && strchr("CcFfoPSsYy", in[1]) && in[2] == ':')) {
|
||||||
|
char *bracep = strchr(in+2, '}');
|
||||||
|
if (bracep) {
|
||||||
|
*inp = bracep;
|
||||||
|
return;
|
||||||
|
} else
|
||||||
|
*closing_brace_missing = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
av_bprint_chars(dst, *in, 1);
|
||||||
|
}
|
||||||
|
|
||||||
int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
|
int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
|
||||||
{
|
{
|
||||||
char *param, buffer[128], tmp[128];
|
char *param, buffer[128], tmp[128];
|
||||||
|
@ -80,24 +104,8 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
|
||||||
if (!line_start)
|
if (!line_start)
|
||||||
av_bprint_chars(dst, *in, 1);
|
av_bprint_chars(dst, *in, 1);
|
||||||
break;
|
break;
|
||||||
case '{': /* skip all {\xxx} substrings except for {\an%d}
|
case '{':
|
||||||
and all microdvd like styles such as {Y:xxx} */
|
handle_open_brace(dst, &in, &an, &closing_brace_missing);
|
||||||
len = 0;
|
|
||||||
an += sscanf(in, "{\\an%*1u}%n", &len) >= 0 && len > 0;
|
|
||||||
|
|
||||||
if (!closing_brace_missing) {
|
|
||||||
if ( (an != 1 && in[1] == '\\')
|
|
||||||
|| (in[1] && strchr("CcFfoPSsYy", in[1]) && in[2] == ':')) {
|
|
||||||
char *bracep = strchr(in+2, '}');
|
|
||||||
if (bracep) {
|
|
||||||
in = bracep;
|
|
||||||
break;
|
|
||||||
} else
|
|
||||||
closing_brace_missing = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
av_bprint_chars(dst, *in, 1);
|
|
||||||
break;
|
break;
|
||||||
case '<':
|
case '<':
|
||||||
tag_close = in[1] == '/';
|
tag_close = in[1] == '/';
|
||||||
|
|
Loading…
Reference in New Issue