virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

lavc/movtextdec: add color and alpha style tags

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

15
libavcodec/movtextdec.c
View File

@ -76,6 +76,8 @@ typedef struct {
uint8_t bold; uint8_t bold;
uint8_t italic; uint8_t italic;
uint8_t underline; uint8_t underline;
int color;
uint8_t alpha;
uint8_t fontsize; uint8_t fontsize;
uint16_t style_fontID; uint16_t style_fontID;
} StyleBox; } StyleBox;
@ -329,14 +331,16 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext *m, AVPacket *avpkt)
m->s_temp->underline = !!(m->s_temp->style_flag & STYLE_FLAG_UNDERLINE); m->s_temp->underline = !!(m->s_temp->style_flag & STYLE_FLAG_UNDERLINE);
tsmb++; tsmb++;
m->s_temp->fontsize = AV_RB8(tsmb); m->s_temp->fontsize = AV_RB8(tsmb);
tsmb++;
m->s_temp->color = AV_RB24(tsmb);
tsmb += 3;
m->s_temp->alpha = AV_RB8(tsmb);
tsmb++;
av_dynarray_add(&m->s, &m->count_s, m->s_temp); av_dynarray_add(&m->s, &m->count_s, m->s_temp);
if(!m->s) { if(!m->s) {
mov_text_cleanup(m); mov_text_cleanup(m);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
tsmb++;
// text-color-rgba
tsmb += 4;
} }
return 0; return 0;
} }
@ -400,6 +404,11 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
if (m->s[entry]->style_fontID == m->ftab[i]->fontID) if (m->s[entry]->style_fontID == m->ftab[i]->fontID)
av_bprintf(buf, "{\\fn%s}", m->ftab[i]->font); 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.alpha != m->s[entry]->alpha)
av_bprintf(buf, "{\\1a&H%02X&}", 255 - m->s[entry]->alpha);
} }
if (text_pos == m->s[entry]->style_end) { if (text_pos == m->s[entry]->style_end) {
if (style_active) { if (style_active) {