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
e1e7939b
Commit
e1e7939b
authored
Feb 03, 2015
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clock: input_clock_ConvertTS: missing log object
parent
a0f54216
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
src/input/clock.c
src/input/clock.c
+2
-2
src/input/clock.h
src/input/clock.h
+2
-1
src/input/decoder.c
src/input/decoder.c
+2
-2
No files found.
src/input/clock.c
View file @
e1e7939b
...
@@ -404,7 +404,7 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl )
...
@@ -404,7 +404,7 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl )
/*****************************************************************************
/*****************************************************************************
* input_clock_ConvertTS
* input_clock_ConvertTS
*****************************************************************************/
*****************************************************************************/
int
input_clock_ConvertTS
(
input_clock_t
*
cl
,
int
input_clock_ConvertTS
(
vlc_object_t
*
p_object
,
input_clock_t
*
cl
,
int
*
pi_rate
,
mtime_t
*
pi_ts0
,
mtime_t
*
pi_ts1
,
int
*
pi_rate
,
mtime_t
*
pi_ts0
,
mtime_t
*
pi_ts1
,
mtime_t
i_ts_bound
)
mtime_t
i_ts_bound
)
{
{
...
@@ -448,7 +448,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
...
@@ -448,7 +448,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
/* Check ts validity */
/* Check ts validity */
if
(
i_ts_bound
!=
INT64_MAX
&&
*
pi_ts0
>
VLC_TS_INVALID
)
{
if
(
i_ts_bound
!=
INT64_MAX
&&
*
pi_ts0
>
VLC_TS_INVALID
)
{
if
(
*
pi_ts0
>=
mdate
()
+
i_ts_delay
+
i_ts_buffering
+
i_ts_bound
)
{
if
(
*
pi_ts0
>=
mdate
()
+
i_ts_delay
+
i_ts_buffering
+
i_ts_bound
)
{
vlc_Log
(
NULL
,
VLC_MSG_ERR
,
"clock"
,
vlc_Log
(
p_object
,
VLC_MSG_ERR
,
"clock"
,
"Timestamp conversion failed (delay %"
PRId64
", buffering "
"Timestamp conversion failed (delay %"
PRId64
", buffering "
"%"
PRId64
", bound %"
PRId64
")"
,
"%"
PRId64
", bound %"
PRId64
")"
,
i_ts_delay
,
i_ts_buffering
,
i_ts_bound
);
i_ts_delay
,
i_ts_buffering
,
i_ts_bound
);
...
...
src/input/clock.h
View file @
e1e7939b
...
@@ -108,7 +108,8 @@ void input_clock_ChangeSystemOrigin( input_clock_t *, bool b_absolute, mtime_
...
@@ -108,7 +108,8 @@ void input_clock_ChangeSystemOrigin( input_clock_t *, bool b_absolute, mtime_
* this case, *p_ts0 and *p_ts1 will hold an invalid timestamp.
* this case, *p_ts0 and *p_ts1 will hold an invalid timestamp.
* Otherwise it will return VLC_SUCCESS.
* Otherwise it will return VLC_SUCCESS.
*/
*/
int
input_clock_ConvertTS
(
input_clock_t
*
,
int
*
pi_rate
,
mtime_t
*
pi_ts0
,
mtime_t
*
pi_ts1
,
mtime_t
i_ts_bound
);
int
input_clock_ConvertTS
(
vlc_object_t
*
,
input_clock_t
*
,
int
*
pi_rate
,
mtime_t
*
pi_ts0
,
mtime_t
*
pi_ts1
,
mtime_t
i_ts_bound
);
/**
/**
* This function returns the current rate.
* This function returns the current rate.
...
...
src/input/decoder.c
View file @
e1e7939b
...
@@ -656,7 +656,7 @@ static mtime_t DecoderGetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
...
@@ -656,7 +656,7 @@ static mtime_t DecoderGetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
if
(
!
p_owner
->
p_clock
||
i_ts
<=
VLC_TS_INVALID
)
if
(
!
p_owner
->
p_clock
||
i_ts
<=
VLC_TS_INVALID
)
return
i_ts
;
return
i_ts
;
if
(
input_clock_ConvertTS
(
p_owner
->
p_clock
,
NULL
,
&
i_ts
,
NULL
,
INT64_MAX
)
)
{
if
(
input_clock_ConvertTS
(
VLC_OBJECT
(
p_dec
),
p_owner
->
p_clock
,
NULL
,
&
i_ts
,
NULL
,
INT64_MAX
)
)
{
msg_Err
(
p_dec
,
"Could not get display date for timestamp %"
PRId64
""
,
i_ts
);
msg_Err
(
p_dec
,
"Could not get display date for timestamp %"
PRId64
""
,
i_ts
);
return
VLC_TS_INVALID
;
return
VLC_TS_INVALID
;
}
}
...
@@ -1032,7 +1032,7 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1,
...
@@ -1032,7 +1032,7 @@ static void DecoderFixTs( decoder_t *p_dec, mtime_t *pi_ts0, mtime_t *pi_ts1,
*
pi_ts0
+=
i_es_delay
;
*
pi_ts0
+=
i_es_delay
;
if
(
pi_ts1
&&
*
pi_ts1
>
VLC_TS_INVALID
)
if
(
pi_ts1
&&
*
pi_ts1
>
VLC_TS_INVALID
)
*
pi_ts1
+=
i_es_delay
;
*
pi_ts1
+=
i_es_delay
;
if
(
input_clock_ConvertTS
(
p_clock
,
&
i_rate
,
pi_ts0
,
pi_ts1
,
i_ts_bound
)
)
{
if
(
input_clock_ConvertTS
(
VLC_OBJECT
(
p_dec
),
p_clock
,
&
i_rate
,
pi_ts0
,
pi_ts1
,
i_ts_bound
)
)
{
if
(
pi_ts1
!=
NULL
)
if
(
pi_ts1
!=
NULL
)
msg_Err
(
p_dec
,
"Could not convert timestamps %"
PRId64
msg_Err
(
p_dec
,
"Could not convert timestamps %"
PRId64
", %"
PRId64
""
,
*
pi_ts0
,
*
pi_ts1
);
", %"
PRId64
""
,
*
pi_ts0
,
*
pi_ts1
);
...
...
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