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
23930b32
Commit
23930b32
authored
Jul 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remoteosd: remove/propogate logically constant value
parent
02622a9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
24 deletions
+2
-24
modules/video_filter/remoteosd.c
modules/video_filter/remoteosd.c
+2
-24
No files found.
modules/video_filter/remoteosd.c
View file @
23930b32
...
@@ -230,8 +230,6 @@ struct filter_sys_t
...
@@ -230,8 +230,6 @@ struct filter_sys_t
char
read_buffer
[
READ_BUFFER_SIZE
];
char
read_buffer
[
READ_BUFFER_SIZE
];
bool
b_continue
;
vlc_thread_t
worker_thread
;
vlc_thread_t
worker_thread
;
uint8_t
ar_color_table_yuv
[
256
][
4
];
uint8_t
ar_color_table_yuv
[
256
][
4
];
...
@@ -253,7 +251,6 @@ static int CreateFilter ( vlc_object_t *p_this )
...
@@ -253,7 +251,6 @@ static int CreateFilter ( vlc_object_t *p_this )
/* Populating struct */
/* Populating struct */
vlc_mutex_init
(
&
p_sys
->
lock
);
vlc_mutex_init
(
&
p_sys
->
lock
);
p_sys
->
b_continue
=
true
;
p_sys
->
i_socket
=
-
1
;
p_sys
->
i_socket
=
-
1
;
p_sys
->
p_pic
=
NULL
;
p_sys
->
p_pic
=
NULL
;
...
@@ -747,8 +744,6 @@ exit:
...
@@ -747,8 +744,6 @@ exit:
if
(
p_sys
->
p_pic
)
if
(
p_sys
->
p_pic
)
picture_Release
(
p_sys
->
p_pic
);
picture_Release
(
p_sys
->
p_pic
);
/* It will hide the subtitle */
p_sys
->
b_continue
=
false
;
p_sys
->
b_need_update
=
true
;
p_sys
->
b_need_update
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
vlc_mutex_unlock
(
&
p_sys
->
lock
);
...
@@ -757,13 +752,6 @@ exit:
...
@@ -757,13 +752,6 @@ exit:
return
NULL
;
return
NULL
;
}
}
static
void
update_request_thread_cleanup
(
void
*
obj
)
{
filter_t
*
p_filter
=
(
filter_t
*
)
obj
;
p_filter
->
p_sys
->
b_continue
=
false
;
}
static
void
*
update_request_thread
(
void
*
obj
)
static
void
*
update_request_thread
(
void
*
obj
)
{
{
filter_t
*
p_filter
=
(
filter_t
*
)
obj
;
filter_t
*
p_filter
=
(
filter_t
*
)
obj
;
...
@@ -779,16 +767,12 @@ static void* update_request_thread( void *obj )
...
@@ -779,16 +767,12 @@ static void* update_request_thread( void *obj )
udr
.
w
=
htons
(
p_sys
->
i_vnc_width
);
udr
.
w
=
htons
(
p_sys
->
i_vnc_width
);
udr
.
h
=
htons
(
p_sys
->
i_vnc_height
);
udr
.
h
=
htons
(
p_sys
->
i_vnc_height
);
int
w
;
int
w
=
write_exact
(
p_filter
,
p_sys
->
i_socket
,
(
char
*
)
&
udr
,
vlc_cleanup_push
(
update_request_thread_cleanup
,
p_filter
);
sz_rfbFramebufferUpdateRequestMsg
);
w
=
write_exact
(
p_filter
,
p_sys
->
i_socket
,
(
char
*
)
&
udr
,
sz_rfbFramebufferUpdateRequestMsg
);
vlc_cleanup_pop
();
if
(
!
w
)
if
(
!
w
)
{
{
msg_Err
(
p_filter
,
"Could not write rfbFramebufferUpdateRequestMsg."
);
msg_Err
(
p_filter
,
"Could not write rfbFramebufferUpdateRequestMsg."
);
update_request_thread_cleanup
(
p_filter
);
return
NULL
;
return
NULL
;
}
}
...
@@ -796,7 +780,6 @@ static void* update_request_thread( void *obj )
...
@@ -796,7 +780,6 @@ static void* update_request_thread( void *obj )
if
(
p_sys
->
b_vnc_poll
)
if
(
p_sys
->
b_vnc_poll
)
{
{
vlc_cleanup_push
(
update_request_thread_cleanup
,
p_filter
);
for
(
;;
)
for
(
;;
)
{
{
msleep
(
p_sys
->
i_vnc_poll_interval
*
1000
);
msleep
(
p_sys
->
i_vnc_poll_interval
*
1000
);
...
@@ -807,8 +790,6 @@ static void* update_request_thread( void *obj )
...
@@ -807,8 +790,6 @@ static void* update_request_thread( void *obj )
break
;
break
;
}
}
}
}
vlc_cleanup_pop
();
p_filter
->
p_sys
->
b_continue
=
false
;
}
}
else
else
{
{
...
@@ -1115,9 +1096,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
...
@@ -1115,9 +1096,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
p_spu
->
i_stop
=
0
;
p_spu
->
i_stop
=
0
;
p_spu
->
b_ephemer
=
true
;
p_spu
->
b_ephemer
=
true
;
if
(
!
p_sys
->
b_continue
)
p_spu
->
i_stop
=
p_spu
->
i_start
+
1
;
/* Create new SPU region */
/* Create new SPU region */
memset
(
&
fmt
,
0
,
sizeof
(
video_format_t
)
);
memset
(
&
fmt
,
0
,
sizeof
(
video_format_t
)
);
fmt
.
i_chroma
=
VLC_CODEC_YUVA
;
fmt
.
i_chroma
=
VLC_CODEC_YUVA
;
...
...
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