| Index: media/base/android/media_source_player.h
|
| diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
|
| index 3b12dd50d0e91cba90c186b2febb4e6b7beda3c5..836482c47d8c7651111c9c69e74d3032bb2262d0 100644
|
| --- a/media/base/android/media_source_player.h
|
| +++ b/media/base/android/media_source_player.h
|
| @@ -46,12 +46,12 @@ class MediaDecoderJob {
|
| // finished successfully, presentation time, timestamp when the data is
|
| // rendered, whether decoder is reaching EOS.
|
| typedef base::Callback<void(DecodeStatus, const base::TimeDelta&,
|
| - const base::Time&, bool)> DecoderCallback;
|
| + const base::TimeTicks&, bool)> DecoderCallback;
|
|
|
| // Called by MediaSourcePlayer to decode some data.
|
| void Decode(
|
| const MediaPlayerHostMsg_ReadFromDemuxerAck_Params::AccessUnit& unit,
|
| - const base::Time& start_wallclock_time,
|
| + const base::TimeTicks& start_wallclock_time,
|
| const base::TimeDelta& start_presentation_timestamp,
|
| const MediaDecoderJob::DecoderCallback& callback);
|
|
|
| @@ -85,7 +85,7 @@ class MediaDecoderJob {
|
| // flushed at the beginning of this call.
|
| void DecodeInternal(
|
| const MediaPlayerHostMsg_ReadFromDemuxerAck_Params::AccessUnit& unit,
|
| - const base::Time& start_wallclock_time,
|
| + const base::TimeTicks& start_wallclock_time,
|
| const base::TimeDelta& start_presentation_timestamp,
|
| bool needs_flush,
|
| const MediaDecoderJob::DecoderCallback& callback);
|
| @@ -161,7 +161,7 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| // Update the timestamps for A/V sync scheduling.
|
| void UpdateTimestamps(
|
| const base::TimeDelta& presentation_timestamp,
|
| - const base::Time& wallclock_time);
|
| + const base::TimeTicks& wallclock_time);
|
|
|
| // Helper function for starting media playback.
|
| void StartInternal();
|
| @@ -173,7 +173,7 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| void MediaDecoderCallback(
|
| bool is_audio, MediaDecoderJob::DecodeStatus decode_status,
|
| const base::TimeDelta& presentation_timestamp,
|
| - const base::Time& wallclock_time, bool end_of_stream);
|
| + const base::TimeTicks& wallclock_time, bool end_of_stream);
|
|
|
| // Handle pending events when all the decoder jobs finished.
|
| void ProcessPendingEvents();
|
| @@ -231,7 +231,7 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| // should be rendered.
|
| // TODO(qinmin): Need to fix the problem if audio/video lagged too far behind
|
| // due to network or decoding problem.
|
| - base::Time start_wallclock_time_;
|
| + base::TimeTicks start_wallclock_time_;
|
| base::TimeDelta start_presentation_timestamp_;
|
|
|
| // The surface object currently owned by the player.
|
|
|