MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/movtextdec: restore active style color after hilite

Browse Source 
Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
John Stebbins 2020-04-04 12:14:48 -06:00 committed by Philip Langdale
parent 032ad7a0bb
commit f406dc9ceb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/movtextdec.c
View File

@ -376,6 +376,7 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
int text_pos = 0;
int style_active = 0;
int entry = 0;
int color = m->d.color;
if (text < text_end && m->box_flags & TWRP_BOX) {
if (m->w.wrap_flag == 1) {
@ -404,9 +405,10 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
if (m->s[entry]->style_fontID == m->ftab[i]->fontID)
av_bprintf(buf, "{\\fn%s}", m->ftab[i]->font);
}
if (m->d.color != m->s[entry]->color)
av_bprintf(buf, "{\\1c&H%X&}",
RGB_TO_BGR(m->s[entry]->color));
if (m->d.color != m->s[entry]->color) {
color = m->s[entry]->color;
av_bprintf(buf, "{\\1c&H%X&}", RGB_TO_BGR(color));
}
if (m->d.alpha != m->s[entry]->alpha)
av_bprintf(buf, "{\\1a&H%02X&}", 255 - m->s[entry]->alpha);
}
@ -414,6 +416,7 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
if (style_active) {
av_bprintf(buf, "{\\r}");
style_active = 0;
color = m->d.color;
}
entry++;
}
@ -435,9 +438,10 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
}
if (text_pos == m->h.hlit_end) {
if (m->box_flags & HCLR_BOX) {
av_bprintf(buf, "{\\2c&H000000&}");
av_bprintf(buf, "{\\2c&H%X&}", RGB_TO_BGR(m->d.color));
} else {
av_bprintf(buf, "{\\1c&HFFFFFF&}{\\2c&H000000&}");
av_bprintf(buf, "{\\1c&H%X&}{\\2c&H%X&}",
RGB_TO_BGR(color), RGB_TO_BGR(m->d.color));
}
}
}