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
38ed2e8e
Commit
38ed2e8e
authored
May 25, 2010
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Used vout_control_Push for vout_RegisterSubpictureChannel.
parent
68e3372b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
src/video_output/control.h
src/video_output/control.h
+2
-0
src/video_output/video_output.c
src/video_output/video_output.c
+18
-1
No files found.
src/video_output/control.h
View file @
38ed2e8e
...
...
@@ -41,6 +41,7 @@ enum {
#endif
VOUT_CONTROL_SUBPICTURE
,
/* subpicture */
VOUT_CONTROL_FLUSH_SUBPICTURE
,
/* integer */
VOUT_CONTROL_REGISTER_SUBPICTURE
,
/* integer_ptr */
VOUT_CONTROL_OSD_TITLE
,
/* string */
VOUT_CONTROL_CHANGE_FILTERS
,
/* string */
VOUT_CONTROL_CHANGE_SUB_FILTERS
,
/* string */
...
...
@@ -70,6 +71,7 @@ typedef struct {
mtime_t
*
time_ptr
;
char
*
string
;
int
integer
;
int
*
integer_ptr
;
struct
{
int
a
;
int
b
;
...
...
src/video_output/video_output.c
View file @
38ed2e8e
...
...
@@ -357,7 +357,16 @@ void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
}
int
vout_RegisterSubpictureChannel
(
vout_thread_t
*
vout
)
{
return
spu_RegisterChannel
(
vout
->
p
->
p_spu
);
int
channel
=
SPU_DEFAULT_CHANNEL
;
vout_control_cmd_t
cmd
;
vout_control_cmd_Init
(
&
cmd
,
VOUT_CONTROL_REGISTER_SUBPICTURE
);
cmd
.
u
.
integer_ptr
=
&
channel
;
vout_control_Push
(
&
vout
->
p
->
control
,
&
cmd
);
vout_control_WaitEmpty
(
&
vout
->
p
->
control
);
return
channel
;
}
void
vout_FlushSubpictureChannel
(
vout_thread_t
*
vout
,
int
channel
)
{
...
...
@@ -760,6 +769,11 @@ static void ThreadDisplaySubpicture(vout_thread_t *vout,
spu_DisplaySubpicture
(
vout
->
p
->
p_spu
,
subpicture
);
}
static
void
ThreadRegisterSubpicture
(
vout_thread_t
*
vout
,
int
*
channel
)
{
*
channel
=
spu_RegisterChannel
(
vout
->
p
->
p_spu
);
}
static
void
ThreadFlushSubpicture
(
vout_thread_t
*
vout
,
int
channel
)
{
spu_ClearChannel
(
vout
->
p
->
p_spu
,
channel
);
...
...
@@ -1123,6 +1137,9 @@ static void *Thread(void *object)
case
VOUT_CONTROL_FLUSH_SUBPICTURE
:
ThreadFlushSubpicture
(
vout
,
cmd
.
u
.
integer
);
break
;
case
VOUT_CONTROL_REGISTER_SUBPICTURE
:
ThreadRegisterSubpicture
(
vout
,
cmd
.
u
.
integer_ptr
);
break
;
case
VOUT_CONTROL_OSD_TITLE
:
ThreadDisplayOsdTitle
(
vout
,
cmd
.
u
.
string
);
break
;
...
...
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