Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
aed698ef
Commit
aed698ef
authored
Dec 17, 2021
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ass: Faster ff_ass_add_rect()
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
6f210eba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
6 deletions
+37
-6
ass.c
libavcodec/ass.c
+30
-6
ass.h
libavcodec/ass.h
+7
-0
No files found.
libavcodec/ass.c
View file @
aed698ef
...
...
@@ -114,17 +114,34 @@ char *ff_ass_get_dialog(int readorder, int layer, const char *style,
speaker
?
speaker
:
""
,
text
);
}
int
ff_ass_add_rect
(
AVSubtitle
*
sub
,
const
char
*
dialog
,
int
ff_ass_add_rect
2
(
AVSubtitle
*
sub
,
const
char
*
dialog
,
int
readorder
,
int
layer
,
const
char
*
style
,
const
char
*
speaker
)
const
char
*
speaker
,
unsigned
*
nb_rect_allocated
)
{
AVSubtitleRect
**
rects
,
*
rect
;
AVSubtitleRect
**
rects
=
sub
->
rects
,
*
rect
;
char
*
ass_str
;
uint64_t
new_nb
=
0
;
rects
=
av_realloc_array
(
sub
->
rects
,
sub
->
num_rects
+
1
,
sizeof
(
*
sub
->
rects
));
if
(
!
rects
)
if
(
sub
->
num_rects
>=
UINT_MAX
)
return
AVERROR
(
ENOMEM
);
sub
->
rects
=
rects
;
if
(
nb_rect_allocated
&&
*
nb_rect_allocated
<=
sub
->
num_rects
)
{
if
(
sub
->
num_rects
<
UINT_MAX
/
17
*
16
)
{
new_nb
=
sub
->
num_rects
+
sub
->
num_rects
/
16
+
1
;
}
else
new_nb
=
UINT_MAX
;
}
else
if
(
!
nb_rect_allocated
)
new_nb
=
sub
->
num_rects
+
1
;
if
(
new_nb
)
{
rects
=
av_realloc_array
(
rects
,
new_nb
,
sizeof
(
*
sub
->
rects
));
if
(
!
rects
)
return
AVERROR
(
ENOMEM
);
if
(
nb_rect_allocated
)
*
nb_rect_allocated
=
new_nb
;
sub
->
rects
=
rects
;
}
rect
=
av_mallocz
(
sizeof
(
*
rect
));
if
(
!
rect
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -137,6 +154,13 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
return
0
;
}
int
ff_ass_add_rect
(
AVSubtitle
*
sub
,
const
char
*
dialog
,
int
readorder
,
int
layer
,
const
char
*
style
,
const
char
*
speaker
)
{
return
ff_ass_add_rect2
(
sub
,
dialog
,
readorder
,
layer
,
style
,
speaker
,
NULL
);
}
void
ff_ass_decoder_flush
(
AVCodecContext
*
avctx
)
{
FFASSDecoderContext
*
s
=
avctx
->
priv_data
;
...
...
libavcodec/ass.h
View file @
aed698ef
...
...
@@ -118,6 +118,13 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog,
int
readorder
,
int
layer
,
const
char
*
style
,
const
char
*
speaker
);
/**
* Add an ASS dialog to a subtitle.
*/
int
ff_ass_add_rect2
(
AVSubtitle
*
sub
,
const
char
*
dialog
,
int
readorder
,
int
layer
,
const
char
*
style
,
const
char
*
speaker
,
unsigned
*
nb_rect_allocated
);
/**
* Helper to flush a text subtitles decoder making use of the
* FFASSDecoderContext.
...
...
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