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
e69310a5
Commit
e69310a5
authored
Aug 01, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XCB screen: timer thread safety
parent
8422667f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
26 deletions
+30
-26
modules/access/screen/xcb.c
modules/access/screen/xcb.c
+30
-26
No files found.
modules/access/screen/xcb.c
View file @
e69310a5
...
@@ -96,9 +96,6 @@ static int Control (demux_t *, int, va_list);
...
@@ -96,9 +96,6 @@ static int Control (demux_t *, int, va_list);
struct
demux_sys_t
struct
demux_sys_t
{
{
/* WARNING: Control() is concurrent with Thread()/Demux().
* Currently, the thread owns everything in read/write, if it exists.
* We destroy it on pause, and re-create it on resume. */
xcb_connection_t
*
conn
;
xcb_connection_t
*
conn
;
es_out_id_t
*
es
;
es_out_id_t
*
es
;
es_format_t
fmt
;
es_format_t
fmt
;
...
@@ -106,8 +103,9 @@ struct demux_sys_t
...
@@ -106,8 +103,9 @@ struct demux_sys_t
xcb_window_t
root
,
window
;
xcb_window_t
root
,
window
;
int16_t
x
,
y
;
int16_t
x
,
y
;
uint16_t
w
,
h
;
uint16_t
w
,
h
;
/* fmt, es and pts are protected by the lock. The rest is read-only. */
/* Timer does not use this, only input threa: */
vlc_mutex_t
lock
;
/* Timer does not use this, only input thread: */
vlc_timer_t
timer
;
vlc_timer_t
timer
;
};
};
...
@@ -243,6 +241,7 @@ static int Open (vlc_object_t *obj)
...
@@ -243,6 +241,7 @@ static int Open (vlc_object_t *obj)
p_sys
->
fmt
.
video
.
i_frame_rate_base
=
1000
;
p_sys
->
fmt
.
video
.
i_frame_rate_base
=
1000
;
p_sys
->
es
=
NULL
;
p_sys
->
es
=
NULL
;
p_sys
->
pts
=
VLC_TS_INVALID
;
p_sys
->
pts
=
VLC_TS_INVALID
;
vlc_mutex_init
(
&
p_sys
->
lock
);
if
(
vlc_timer_create
(
&
p_sys
->
timer
,
Demux
,
demux
))
if
(
vlc_timer_create
(
&
p_sys
->
timer
,
Demux
,
demux
))
goto
error
;
goto
error
;
vlc_timer_schedule
(
&
p_sys
->
timer
,
false
,
1
,
p_sys
->
interval
);
vlc_timer_schedule
(
&
p_sys
->
timer
,
false
,
1
,
p_sys
->
interval
);
...
@@ -268,6 +267,7 @@ static void Close (vlc_object_t *obj)
...
@@ -268,6 +267,7 @@ static void Close (vlc_object_t *obj)
demux_sys_t
*
p_sys
=
demux
->
p_sys
;
demux_sys_t
*
p_sys
=
demux
->
p_sys
;
vlc_timer_destroy
(
&
p_sys
->
timer
);
vlc_timer_destroy
(
&
p_sys
->
timer
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
xcb_disconnect
(
p_sys
->
conn
);
xcb_disconnect
(
p_sys
->
conn
);
free
(
p_sys
);
free
(
p_sys
);
}
}
...
@@ -319,8 +319,10 @@ static int Control (demux_t *demux, int query, va_list args)
...
@@ -319,8 +319,10 @@ static int Control (demux_t *demux, int query, va_list args)
if
(
!
pausing
)
if
(
!
pausing
)
{
{
vlc_mutex_lock
(
&
p_sys
->
lock
);
p_sys
->
pts
=
VLC_TS_INVALID
;
p_sys
->
pts
=
VLC_TS_INVALID
;
es_out_Control
(
demux
->
out
,
ES_OUT_RESET_PCR
);
es_out_Control
(
demux
->
out
,
ES_OUT_RESET_PCR
);
vlc_mutex_unlock
(
&
p_sys
->
lock
);
}
}
vlc_timer_schedule
(
&
p_sys
->
timer
,
false
,
vlc_timer_schedule
(
&
p_sys
->
timer
,
false
,
pausing
?
0
:
1
,
p_sys
->
interval
);
pausing
?
0
:
1
,
p_sys
->
interval
);
...
@@ -368,22 +370,12 @@ static void Demux (void *data)
...
@@ -368,22 +370,12 @@ static void Demux (void *data)
uint16_t
w
=
geo
->
width
-
x
;
uint16_t
w
=
geo
->
width
-
x
;
uint16_t
h
=
geo
->
height
-
y
;
uint16_t
h
=
geo
->
height
-
y
;
free
(
geo
);
if
(
p_sys
->
w
>
0
&&
p_sys
->
w
<
w
)
if
(
p_sys
->
w
>
0
&&
p_sys
->
w
<
w
)
w
=
p_sys
->
w
;
w
=
p_sys
->
w
;
if
(
p_sys
->
h
>
0
&&
p_sys
->
h
<
h
)
if
(
p_sys
->
h
>
0
&&
p_sys
->
h
<
h
)
h
=
p_sys
->
h
;
h
=
p_sys
->
h
;
if
(
w
!=
p_sys
->
fmt
.
video
.
i_visible_width
||
h
!=
p_sys
->
fmt
.
video
.
i_visible_height
)
{
if
(
p_sys
->
es
!=
NULL
)
es_out_Del
(
demux
->
out
,
p_sys
->
es
);
p_sys
->
fmt
.
video
.
i_visible_width
=
p_sys
->
fmt
.
video
.
i_width
=
w
;
p_sys
->
fmt
.
video
.
i_visible_height
=
p_sys
->
fmt
.
video
.
i_height
=
h
;
p_sys
->
es
=
es_out_Add
(
demux
->
out
,
&
p_sys
->
fmt
);
}
free
(
geo
);
if
(
p_sys
->
window
!=
p_sys
->
root
)
if
(
p_sys
->
window
!=
p_sys
->
root
)
{
{
xcb_translate_coordinates_reply_t
*
coords
=
xcb_translate_coordinates_reply_t
*
coords
=
...
@@ -395,10 +387,6 @@ static void Demux (void *data)
...
@@ -395,10 +387,6 @@ static void Demux (void *data)
free
(
coords
);
free
(
coords
);
}
}
/* Capture screen */
if
(
p_sys
->
es
==
NULL
)
return
;
xcb_get_image_reply_t
*
img
;
xcb_get_image_reply_t
*
img
;
img
=
xcb_get_image_reply
(
conn
,
img
=
xcb_get_image_reply
(
conn
,
xcb_get_image
(
conn
,
XCB_IMAGE_FORMAT_Z_PIXMAP
,
p_sys
->
root
,
xcb_get_image
(
conn
,
XCB_IMAGE_FORMAT_Z_PIXMAP
,
p_sys
->
root
,
...
@@ -412,6 +400,20 @@ static void Demux (void *data)
...
@@ -412,6 +400,20 @@ static void Demux (void *data)
if
(
block
==
NULL
)
if
(
block
==
NULL
)
return
;
return
;
vlc_mutex_lock
(
&
p_sys
->
lock
);
if
(
w
!=
p_sys
->
fmt
.
video
.
i_visible_width
||
h
!=
p_sys
->
fmt
.
video
.
i_visible_height
)
{
if
(
p_sys
->
es
!=
NULL
)
es_out_Del
(
demux
->
out
,
p_sys
->
es
);
p_sys
->
fmt
.
video
.
i_visible_width
=
p_sys
->
fmt
.
video
.
i_width
=
w
;
p_sys
->
fmt
.
video
.
i_visible_height
=
p_sys
->
fmt
.
video
.
i_height
=
h
;
p_sys
->
es
=
es_out_Add
(
demux
->
out
,
&
p_sys
->
fmt
);
}
/* Capture screen */
if
(
p_sys
->
es
!=
NULL
)
{
if
(
p_sys
->
pts
==
VLC_TS_INVALID
)
if
(
p_sys
->
pts
==
VLC_TS_INVALID
)
p_sys
->
pts
=
mdate
();
p_sys
->
pts
=
mdate
();
block
->
i_pts
=
block
->
i_dts
=
p_sys
->
pts
;
block
->
i_pts
=
block
->
i_dts
=
p_sys
->
pts
;
...
@@ -419,4 +421,6 @@ static void Demux (void *data)
...
@@ -419,4 +421,6 @@ static void Demux (void *data)
es_out_Control
(
demux
->
out
,
ES_OUT_SET_PCR
,
p_sys
->
pts
);
es_out_Control
(
demux
->
out
,
ES_OUT_SET_PCR
,
p_sys
->
pts
);
es_out_Send
(
demux
->
out
,
p_sys
->
es
,
block
);
es_out_Send
(
demux
->
out
,
p_sys
->
es
,
block
);
p_sys
->
pts
+=
p_sys
->
interval
;
p_sys
->
pts
+=
p_sys
->
interval
;
}
vlc_mutex_unlock
(
&
p_sys
->
lock
);
}
}
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