Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
b72b3e53
Commit
b72b3e53
authored
Sep 24, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed one dependency of the clock on input_thread_t.
parent
abc4689a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
src/input/clock.c
src/input/clock.c
+2
-4
src/input/es_out.c
src/input/es_out.c
+7
-1
src/input/input_internal.h
src/input/input_internal.h
+1
-1
No files found.
src/input/clock.c
View file @
b72b3e53
...
@@ -300,10 +300,8 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl, input_thread_t *p_input )
...
@@ -300,10 +300,8 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl, input_thread_t *p_input )
if
(
!
cl
->
b_has_reference
)
if
(
!
cl
->
b_has_reference
)
return
0
;
return
0
;
/* We must not wait if not pace controled, or we are not the
/* We must not wait if we are not the master clock */
* master clock */
if
(
!
cl
->
b_master
)
if
(
!
p_input
->
b_can_pace_control
||
!
cl
->
b_master
||
p_input
->
p
->
b_out_pace_control
)
return
0
;
return
0
;
/* */
/* */
...
...
src/input/es_out.c
View file @
b72b3e53
...
@@ -355,7 +355,13 @@ mtime_t input_EsOutGetWakeup( es_out_t *out )
...
@@ -355,7 +355,13 @@ mtime_t input_EsOutGetWakeup( es_out_t *out )
if
(
!
p_sys
->
p_pgrm
)
if
(
!
p_sys
->
p_pgrm
)
return
0
;
return
0
;
return
input_clock_GetWakeup
(
p_sys
->
p_pgrm
->
p_clock
,
p_sys
->
p_input
);
/* We do not have a wake up date if the input cannot have its speed
* controlled or sout is imposing its own */
if
(
!
p_input
->
b_can_pace_control
||
p_input
->
p
->
b_out_pace_control
)
return
0
;
return
input_clock_GetWakeup
(
p_sys
->
p_pgrm
->
p_clock
);
}
}
static
void
EsOutDiscontinuity
(
es_out_t
*
out
,
bool
b_flush
,
bool
b_audio
)
static
void
EsOutDiscontinuity
(
es_out_t
*
out
,
bool
b_flush
,
bool
b_audio
)
...
...
src/input/input_internal.h
View file @
b72b3e53
...
@@ -366,7 +366,7 @@ void input_clock_ResetPCR( input_clock_t * );
...
@@ -366,7 +366,7 @@ void input_clock_ResetPCR( input_clock_t * );
mtime_t
input_clock_GetTS
(
input_clock_t
*
,
mtime_t
i_pts_delay
,
mtime_t
);
mtime_t
input_clock_GetTS
(
input_clock_t
*
,
mtime_t
i_pts_delay
,
mtime_t
);
void
input_clock_SetRate
(
input_clock_t
*
cl
,
int
i_rate
);
void
input_clock_SetRate
(
input_clock_t
*
cl
,
int
i_rate
);
void
input_clock_SetMaster
(
input_clock_t
*
cl
,
bool
b_master
);
void
input_clock_SetMaster
(
input_clock_t
*
cl
,
bool
b_master
);
mtime_t
input_clock_GetWakeup
(
input_clock_t
*
cl
,
input_thread_t
*
);
mtime_t
input_clock_GetWakeup
(
input_clock_t
*
cl
);
/* Subtitles */
/* Subtitles */
char
**
subtitles_Detect
(
input_thread_t
*
,
char
*
path
,
const
char
*
fname
);
char
**
subtitles_Detect
(
input_thread_t
*
,
char
*
path
,
const
char
*
fname
);
...
...
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