Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
630ccbb6
Commit
630ccbb6
authored
Feb 15, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input_clock_ConvertTS: log failures
parent
dfaaba05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
src/input/clock.c
src/input/clock.c
+9
-3
src/input/decoder.c
src/input/decoder.c
+6
-2
No files found.
src/input/clock.c
View file @
630ccbb6
...
...
@@ -446,9 +446,15 @@ int input_clock_ConvertTS( input_clock_t *cl,
vlc_mutex_unlock
(
&
cl
->
lock
);
/* Check ts validity */
if
(
i_ts_bound
!=
INT64_MAX
&&
*
pi_ts0
>
VLC_TS_INVALID
&&
*
pi_ts0
>=
mdate
()
+
i_ts_delay
+
i_ts_buffering
+
i_ts_bound
)
return
VLC_EGENERIC
;
if
(
i_ts_bound
!=
INT64_MAX
&&
*
pi_ts0
>
VLC_TS_INVALID
)
{
if
(
*
pi_ts0
>=
mdate
()
+
i_ts_delay
+
i_ts_buffering
+
i_ts_bound
)
{
vlc_Log
(
NULL
,
VLC_MSG_ERR
,
"clock"
,
"Timestamp conversion failed (delay %"
PRId64
", buffering "
"%"
PRId64
", bound %"
PRId64
")"
,
i_ts_delay
,
i_ts_buffering
,
i_ts_bound
);
return
VLC_EGENERIC
;
}
}
return
VLC_SUCCESS
;
}
...
...
src/input/decoder.c
View file @
630ccbb6
...
...
@@ -666,8 +666,10 @@ static mtime_t DecoderGetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
if
(
!
p_owner
->
p_clock
||
i_ts
<=
VLC_TS_INVALID
)
return
i_ts
;
if
(
input_clock_ConvertTS
(
p_owner
->
p_clock
,
NULL
,
&
i_ts
,
NULL
,
INT64_MAX
)
)
if
(
input_clock_ConvertTS
(
p_owner
->
p_clock
,
NULL
,
&
i_ts
,
NULL
,
INT64_MAX
)
)
{
msg_Err
(
p_dec
,
"Could not get display date for timestamp %"
PRId64
""
,
i_ts
);
return
VLC_TS_INVALID
;
}
return
i_ts
;
}
...
...
@@ -1062,8 +1064,10 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1,
*
pi_ts0
+=
i_es_delay
;
if
(
pi_ts1
&&
*
pi_ts1
>
VLC_TS_INVALID
)
*
pi_ts1
+=
i_es_delay
;
if
(
input_clock_ConvertTS
(
p_clock
,
&
i_rate
,
pi_ts0
,
pi_ts1
,
i_ts_bound
)
)
if
(
input_clock_ConvertTS
(
p_clock
,
&
i_rate
,
pi_ts0
,
pi_ts1
,
i_ts_bound
)
)
{
msg_Err
(
p_dec
,
"Could not convert timestamps %"
PRId64
", %"
PRId64
""
,
pi_ts0
,
pi_ts1
);
*
pi_ts0
=
VLC_TS_INVALID
;
}
}
else
{
...
...
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