Commit e1e7939b authored by François Cartegnie's avatar François Cartegnie 🤞

clock: input_clock_ConvertTS: missing log object

parent a0f54216
......@@ -404,7 +404,7 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl )
/*****************************************************************************
* 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,
mtime_t i_ts_bound )
{
......@@ -448,7 +448,7 @@ int input_clock_ConvertTS( input_clock_t *cl,
/* Check ts validity */
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",
vlc_Log(p_object, VLC_MSG_ERR, "clock",
"Timestamp conversion failed (delay %"PRId64", buffering "
"%"PRId64", bound %"PRId64")",
i_ts_delay, i_ts_buffering, i_ts_bound);
......
......@@ -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.
* 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.
......
......@@ -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 )
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);
return VLC_TS_INVALID;
}
......@@ -1032,7 +1032,7 @@ 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( VLC_OBJECT(p_dec), p_clock, &i_rate, pi_ts0, pi_ts1, i_ts_bound ) ) {
if( pi_ts1 != NULL )
msg_Err(p_dec, "Could not convert timestamps %"PRId64
", %"PRId64"", *pi_ts0, *pi_ts1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment