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
d8ebad9e
Commit
d8ebad9e
authored
Apr 25, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Complete review of clock.c to use VLC_TS_INVALID.
It has no functionnality changes.
parent
1eee55ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
src/input/clock.c
src/input/clock.c
+17
-17
No files found.
src/input/clock.c
View file @
d8ebad9e
...
@@ -164,19 +164,19 @@ input_clock_t *input_clock_New( int i_rate )
...
@@ -164,19 +164,19 @@ input_clock_t *input_clock_New( int i_rate )
vlc_mutex_init
(
&
cl
->
lock
);
vlc_mutex_init
(
&
cl
->
lock
);
cl
->
b_has_reference
=
false
;
cl
->
b_has_reference
=
false
;
cl
->
ref
=
clock_point_Create
(
0
,
0
);
cl
->
ref
=
clock_point_Create
(
VLC_TS_INVALID
,
VLC_TS_INVALID
);
cl
->
last
=
clock_point_Create
(
0
,
0
);
cl
->
last
=
clock_point_Create
(
VLC_TS_INVALID
,
VLC_TS_INVALID
);
cl
->
i_ts_max
=
0
;
cl
->
i_ts_max
=
VLC_TS_INVALID
;
cl
->
i_next_drift_update
=
0
;
cl
->
i_next_drift_update
=
VLC_TS_INVALID
;
AvgInit
(
&
cl
->
drift
,
10
);
AvgInit
(
&
cl
->
drift
,
10
);
cl
->
i_rate
=
i_rate
;
cl
->
i_rate
=
i_rate
;
cl
->
i_pts_delay
=
0
;
cl
->
i_pts_delay
=
0
;
cl
->
b_paused
=
false
;
cl
->
b_paused
=
false
;
cl
->
i_pause_date
=
0
;
cl
->
i_pause_date
=
VLC_TS_INVALID
;
return
cl
;
return
cl
;
}
}
...
@@ -206,12 +206,12 @@ void input_clock_Update( input_clock_t *cl,
...
@@ -206,12 +206,12 @@ void input_clock_Update( input_clock_t *cl,
vlc_mutex_lock
(
&
cl
->
lock
);
vlc_mutex_lock
(
&
cl
->
lock
);
if
(
(
!
cl
->
b_has_reference
)
||
if
(
(
!
cl
->
b_has_reference
)
||
(
i_ck_stream
==
0
&&
cl
->
last
.
i_stream
!=
0
)
)
(
i_ck_stream
<=
VLC_TS_INVALID
&&
cl
->
last
.
i_stream
>
VLC_TS_INVALID
)
)
{
{
/* */
/* */
b_reset_reference
=
true
;
b_reset_reference
=
true
;
}
}
else
if
(
cl
->
last
.
i_stream
!=
0
&&
else
if
(
cl
->
last
.
i_stream
>
VLC_TS_INVALID
&&
(
(
cl
->
last
.
i_stream
-
i_ck_stream
)
>
CR_MAX_GAP
||
(
(
cl
->
last
.
i_stream
-
i_ck_stream
)
>
CR_MAX_GAP
||
(
cl
->
last
.
i_stream
-
i_ck_stream
)
<
-
CR_MAX_GAP
)
)
(
cl
->
last
.
i_stream
-
i_ck_stream
)
<
-
CR_MAX_GAP
)
)
{
{
...
@@ -219,7 +219,7 @@ void input_clock_Update( input_clock_t *cl,
...
@@ -219,7 +219,7 @@ void input_clock_Update( input_clock_t *cl,
* warning from the stream control facilities (dd-edited
* warning from the stream control facilities (dd-edited
* stream ?). */
* stream ?). */
msg_Warn
(
p_log
,
"clock gap, unexpected stream discontinuity"
);
msg_Warn
(
p_log
,
"clock gap, unexpected stream discontinuity"
);
cl
->
i_ts_max
=
0
;
cl
->
i_ts_max
=
VLC_TS_INVALID
;
/* */
/* */
msg_Warn
(
p_log
,
"feeding synchro with a new reference point trying to recover from clock gap"
);
msg_Warn
(
p_log
,
"feeding synchro with a new reference point trying to recover from clock gap"
);
...
@@ -227,7 +227,7 @@ void input_clock_Update( input_clock_t *cl,
...
@@ -227,7 +227,7 @@ void input_clock_Update( input_clock_t *cl,
}
}
if
(
b_reset_reference
)
if
(
b_reset_reference
)
{
{
cl
->
i_next_drift_update
=
0
;
cl
->
i_next_drift_update
=
VLC_TS_INVALID
;
AvgReset
(
&
cl
->
drift
);
AvgReset
(
&
cl
->
drift
);
/* Feed synchro with a new reference point. */
/* Feed synchro with a new reference point. */
...
@@ -257,8 +257,8 @@ void input_clock_Reset( input_clock_t *cl )
...
@@ -257,8 +257,8 @@ void input_clock_Reset( input_clock_t *cl )
vlc_mutex_lock
(
&
cl
->
lock
);
vlc_mutex_lock
(
&
cl
->
lock
);
cl
->
b_has_reference
=
false
;
cl
->
b_has_reference
=
false
;
cl
->
ref
=
clock_point_Create
(
0
,
0
);
cl
->
ref
=
clock_point_Create
(
VLC_TS_INVALID
,
VLC_TS_INVALID
);
cl
->
i_ts_max
=
0
;
cl
->
i_ts_max
=
VLC_TS_INVALID
;
vlc_mutex_unlock
(
&
cl
->
lock
);
vlc_mutex_unlock
(
&
cl
->
lock
);
}
}
...
@@ -342,14 +342,14 @@ int input_clock_ConvertTS( input_clock_t *cl,
...
@@ -342,14 +342,14 @@ int input_clock_ConvertTS( input_clock_t *cl,
if
(
!
cl
->
b_has_reference
)
if
(
!
cl
->
b_has_reference
)
{
{
vlc_mutex_unlock
(
&
cl
->
lock
);
vlc_mutex_unlock
(
&
cl
->
lock
);
*
pi_ts0
=
0
;
*
pi_ts0
=
VLC_TS_INVALID
;
if
(
pi_ts1
)
if
(
pi_ts1
)
*
pi_ts1
=
0
;
*
pi_ts1
=
VLC_TS_INVALID
;
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
/* */
/* */
if
(
*
pi_ts0
>
0
)
if
(
*
pi_ts0
>
VLC_TS_INVALID
)
{
{
*
pi_ts0
=
ClockStreamToSystem
(
cl
,
*
pi_ts0
+
AvgGet
(
&
cl
->
drift
)
);
*
pi_ts0
=
ClockStreamToSystem
(
cl
,
*
pi_ts0
+
AvgGet
(
&
cl
->
drift
)
);
if
(
*
pi_ts0
>
cl
->
i_ts_max
)
if
(
*
pi_ts0
>
cl
->
i_ts_max
)
...
@@ -358,7 +358,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
...
@@ -358,7 +358,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
}
}
/* XXX we do not ipdate i_ts_max on purpose */
/* XXX we do not ipdate i_ts_max on purpose */
if
(
pi_ts1
&&
*
pi_ts1
>
0
)
if
(
pi_ts1
&&
*
pi_ts1
>
VLC_TS_INVALID
)
{
{
*
pi_ts1
=
ClockStreamToSystem
(
cl
,
*
pi_ts1
+
AvgGet
(
&
cl
->
drift
)
)
+
*
pi_ts1
=
ClockStreamToSystem
(
cl
,
*
pi_ts1
+
AvgGet
(
&
cl
->
drift
)
)
+
cl
->
i_pts_delay
;
cl
->
i_pts_delay
;
...
@@ -369,7 +369,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
...
@@ -369,7 +369,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
/* Check ts validity */
/* Check ts validity */
if
(
i_ts_bound
!=
INT64_MAX
&&
if
(
i_ts_bound
!=
INT64_MAX
&&
*
pi_ts0
>
0
&&
*
pi_ts0
>=
mdate
()
+
cl
->
i_pts_delay
+
i_ts_bound
)
*
pi_ts0
>
VLC_TS_INVALID
&&
*
pi_ts0
>=
mdate
()
+
cl
->
i_pts_delay
+
i_ts_bound
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
@@ -452,7 +452,7 @@ void input_clock_SetJitter( input_clock_t *cl,
...
@@ -452,7 +452,7 @@ void input_clock_SetJitter( input_clock_t *cl,
static
mtime_t
ClockStreamToSystem
(
input_clock_t
*
cl
,
mtime_t
i_stream
)
static
mtime_t
ClockStreamToSystem
(
input_clock_t
*
cl
,
mtime_t
i_stream
)
{
{
if
(
!
cl
->
b_has_reference
)
if
(
!
cl
->
b_has_reference
)
return
0
;
return
VLC_TS_INVALID
;
return
(
i_stream
-
cl
->
ref
.
i_stream
)
*
cl
->
i_rate
/
INPUT_RATE_DEFAULT
+
return
(
i_stream
-
cl
->
ref
.
i_stream
)
*
cl
->
i_rate
/
INPUT_RATE_DEFAULT
+
cl
->
ref
.
i_system
;
cl
->
ref
.
i_system
;
...
...
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