[vlc-commits] clock: input_clock_ConvertTS: missing log object

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Feb  3 12:42:17 2015 +0100| [6d8105f26f903514ede404d0b2c44fbcc84af622] | committer: Jean-Baptiste Kempf

clock: input_clock_ConvertTS: missing log object

(cherry picked from commit e1e7939bd4cf5aef1429662966b461f7cccadb46)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=6d8105f26f903514ede404d0b2c44fbcc84af622
---

 src/input/clock.c   |    4 ++--
 src/input/clock.h   |    3 ++-
 src/input/decoder.c |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/input/clock.c b/src/input/clock.c
index 1419f8f..2cae7db 100644
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -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);
diff --git a/src/input/clock.h b/src/input/clock.h
index ee1492b..dc4c8bd 100644
--- a/src/input/clock.h
+++ b/src/input/clock.h
@@ -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.
diff --git a/src/input/decoder.c b/src/input/decoder.c
index b956551..ef865e9 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -666,7 +666,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;
     }
@@ -1066,7 +1066,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);