Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
337ac422
Commit
337ac422
authored
May 03, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Video filters: move to text_segment
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
3f98a0ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
modules/video_filter/dynamicoverlay/dynamicoverlay.c
modules/video_filter/dynamicoverlay/dynamicoverlay.c
+1
-1
modules/video_filter/marq.c
modules/video_filter/marq.c
+1
-1
modules/video_filter/rss.c
modules/video_filter/rss.c
+1
-1
modules/video_filter/subsdelay.c
modules/video_filter/subsdelay.c
+5
-5
No files found.
modules/video_filter/dynamicoverlay/dynamicoverlay.c
View file @
337ac422
...
...
@@ -364,7 +364,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
if
(
p_overlay
->
format
.
i_chroma
==
VLC_CODEC_TEXT
)
{
p_region
->
p
sz_text
=
strdup
(
p_overlay
->
data
.
p_text
);
p_region
->
p
_text
=
text_segment_New
(
p_overlay
->
data
.
p_text
);
p_region
->
p_style
=
text_style_Duplicate
(
p_overlay
->
p_fontstyle
);
}
else
...
...
modules/video_filter/marq.c
View file @
337ac422
...
...
@@ -310,7 +310,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
p_sys
->
last_time
=
date
;
p_spu
->
p_region
->
p
sz_text
=
strdup
(
msg
);
p_spu
->
p_region
->
p
_text
=
text_segment_New
(
msg
);
p_spu
->
i_start
=
date
;
p_spu
->
i_stop
=
p_sys
->
i_timeout
==
0
?
0
:
date
+
p_sys
->
i_timeout
*
1000
;
p_spu
->
b_ephemer
=
true
;
...
...
modules/video_filter/rss.c
View file @
337ac422
...
...
@@ -479,7 +479,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
free
(
a2
);
}
p_spu
->
p_region
->
p
sz_text
=
strdup
(
p_sys
->
psz_marquee
);
p_spu
->
p_region
->
p
_text
=
text_segment_New
(
p_sys
->
psz_marquee
);
if
(
p_sys
->
p_style
->
i_font_size
>
0
)
p_spu
->
p_region
->
fmt
.
i_visible_height
=
p_sys
->
p_style
->
i_font_size
;
p_spu
->
i_start
=
date
;
...
...
modules/video_filter/subsdelay.c
View file @
337ac422
...
...
@@ -1053,7 +1053,7 @@ static void SubpicLocalUpdate( subpicture_t* p_subpic, mtime_t i_ts )
if
(
p_entry
->
b_check_empty
&&
p_subpic
->
p_region
)
{
if
(
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
psz_html
)
||
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
psz_text
)
)
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
p
_text
->
p
sz_text
)
)
{
/* remove empty subtitle */
...
...
@@ -1117,7 +1117,7 @@ static void SubpicLocalUpdate( subpicture_t* p_subpic, mtime_t i_ts )
static
bool
SubpicIsEmpty
(
subpicture_t
*
p_subpic
)
{
return
(
p_subpic
->
p_region
&&
(
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
psz_html
)
||
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
psz_text
)
)
);
SubsdelayIsTextEmpty
(
p_subpic
->
p_region
->
p
_text
->
p
sz_text
)
)
);
}
/*****************************************************************************
...
...
@@ -1180,12 +1180,12 @@ static int64_t SubsdelayEstimateDelay( filter_t *p_filter, subsdelay_heap_entry_
if
(
i_mode
==
SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT
)
{
if
(
p_entry
->
p_subpic
&&
p_entry
->
p_subpic
->
p_region
&&
(
p_entry
->
p_subpic
->
p_region
->
psz_text
if
(
p_entry
->
p_subpic
&&
p_entry
->
p_subpic
->
p_region
&&
(
p_entry
->
p_subpic
->
p_region
->
p
_text
->
p
sz_text
||
p_entry
->
p_subpic
->
p_region
->
psz_html
)
)
{
if
(
p_entry
->
p_subpic
->
p_region
->
psz_text
)
if
(
p_entry
->
p_subpic
->
p_region
->
p
_text
->
p
sz_text
)
{
i_rank
=
SubsdelayGetTextRank
(
p_entry
->
p_subpic
->
p_region
->
psz_text
);
i_rank
=
SubsdelayGetTextRank
(
p_entry
->
p_subpic
->
p_region
->
p
_text
->
p
sz_text
);
}
else
{
...
...
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