mirror of https://git.ffmpeg.org/ffmpeg.git
lavc/movtextdec: add alpha default to ass header colors
Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
parent
c0d3fea600
commit
91447ae3ba
|
@ -55,7 +55,9 @@ typedef struct {
|
||||||
const char *font;
|
const char *font;
|
||||||
uint8_t fontsize;
|
uint8_t fontsize;
|
||||||
int color;
|
int color;
|
||||||
|
uint8_t alpha;
|
||||||
int back_color;
|
int back_color;
|
||||||
|
uint8_t back_alpha;
|
||||||
uint8_t bold;
|
uint8_t bold;
|
||||||
uint8_t italic;
|
uint8_t italic;
|
||||||
uint8_t underline;
|
uint8_t underline;
|
||||||
|
@ -186,7 +188,9 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m)
|
||||||
}
|
}
|
||||||
// Background Color
|
// Background Color
|
||||||
m->d.back_color = AV_RB24(tx3g_ptr);
|
m->d.back_color = AV_RB24(tx3g_ptr);
|
||||||
tx3g_ptr += 4;
|
tx3g_ptr += 3;
|
||||||
|
m->d.back_alpha = AV_RB8(tx3g_ptr);
|
||||||
|
tx3g_ptr += 1;
|
||||||
// BoxRecord
|
// BoxRecord
|
||||||
tx3g_ptr += 8;
|
tx3g_ptr += 8;
|
||||||
// StyleRecord
|
// StyleRecord
|
||||||
|
@ -203,7 +207,9 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m)
|
||||||
m->d.fontsize = *tx3g_ptr++;
|
m->d.fontsize = *tx3g_ptr++;
|
||||||
// Primary color
|
// Primary color
|
||||||
m->d.color = AV_RB24(tx3g_ptr);
|
m->d.color = AV_RB24(tx3g_ptr);
|
||||||
tx3g_ptr += 4;
|
tx3g_ptr += 3;
|
||||||
|
m->d.alpha = AV_RB8(tx3g_ptr);
|
||||||
|
tx3g_ptr += 1;
|
||||||
// FontRecord
|
// FontRecord
|
||||||
// FontRecord Size
|
// FontRecord Size
|
||||||
tx3g_ptr += 4;
|
tx3g_ptr += 4;
|
||||||
|
@ -463,8 +469,8 @@ static int mov_text_init(AVCodecContext *avctx) {
|
||||||
ret = mov_text_tx3g(avctx, m);
|
ret = mov_text_tx3g(avctx, m);
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize,
|
return ff_ass_subtitle_header(avctx, m->d.font, m->d.fontsize,
|
||||||
RGB_TO_BGR(m->d.color),
|
(255 - m->d.alpha) << 24 | RGB_TO_BGR(m->d.color),
|
||||||
RGB_TO_BGR(m->d.back_color),
|
(255 - m->d.back_alpha) << 24 | RGB_TO_BGR(m->d.back_color),
|
||||||
m->d.bold, m->d.italic, m->d.underline,
|
m->d.bold, m->d.italic, m->d.underline,
|
||||||
ASS_DEFAULT_BORDERSTYLE, m->d.alignment);
|
ASS_DEFAULT_BORDERSTYLE, m->d.alignment);
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -6,7 +6,7 @@ PlayResY: 288
|
||||||
|
|
||||||
[V4+ Styles]
|
[V4+ Styles]
|
||||||
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
|
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
|
||||||
Style: Default,Serif,18,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0
|
Style: Default,Serif,18,&Hffffff,&Hffffff,&Hff000000,&Hff000000,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0
|
||||||
|
|
||||||
[Events]
|
[Events]
|
||||||
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
|
||||||
|
|
Loading…
Reference in New Issue