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
c21bc6b1
Commit
c21bc6b1
authored
Sep 03, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l: measure time from start (fixes #7400)
parent
4c4fa08c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
modules/access/v4l2/demux.c
modules/access/v4l2/demux.c
+5
-1
No files found.
modules/access/v4l2/demux.c
View file @
c21bc6b1
...
...
@@ -57,6 +57,7 @@ struct demux_sys_t
es_out_id_t
*
es
;
vlc_v4l2_ctrl_t
*
controls
;
mtime_t
start
;
};
static
void
*
UserPtrThread
(
void
*
);
...
...
@@ -94,6 +95,7 @@ int DemuxOpen( vlc_object_t *obj )
}
sys
->
controls
=
ControlsInit
(
VLC_OBJECT
(
demux
),
fd
);
sys
->
start
=
mdate
();
demux
->
pf_demux
=
NULL
;
demux
->
pf_control
=
DemuxControl
;
demux
->
info
.
i_update
=
0
;
...
...
@@ -628,6 +630,8 @@ static void *ReadThread (void *data)
static
int
DemuxControl
(
demux_t
*
demux
,
int
query
,
va_list
args
)
{
demux_sys_t
*
sys
=
demux
->
p_sys
;
switch
(
query
)
{
/* Special for access_demux */
...
...
@@ -643,7 +647,7 @@ static int DemuxControl( demux_t *demux, int query, va_list args )
return
VLC_SUCCESS
;
case
DEMUX_GET_TIME
:
*
va_arg
(
args
,
int64_t
*
)
=
mdate
()
;
*
va_arg
(
args
,
int64_t
*
)
=
mdate
()
-
sys
->
start
;
return
VLC_SUCCESS
;
/* TODO implement others */
...
...
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