Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
032ad7a0
Commit
032ad7a0
authored
Apr 04, 2020
by
John Stebbins
Committed by
Philip Langdale
Apr 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/movtextdec: add color and alpha style tags
Signed-off-by:
Philip Langdale
<
philipl@overt.org
>
parent
91447ae3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
movtextdec.c
libavcodec/movtextdec.c
+12
-3
No files found.
libavcodec/movtextdec.c
View file @
032ad7a0
...
...
@@ -76,6 +76,8 @@ typedef struct {
uint8_t
bold
;
uint8_t
italic
;
uint8_t
underline
;
int
color
;
uint8_t
alpha
;
uint8_t
fontsize
;
uint16_t
style_fontID
;
}
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
);
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
);
if
(
!
m
->
s
)
{
mov_text_cleanup
(
m
);
return
AVERROR
(
ENOMEM
);
}
tsmb
++
;
// text-color-rgba
tsmb
+=
4
;
}
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
)
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
(
style_active
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment