Rename media::Clock to media::TimeDeltaInterpolator and update API.

media/base/android/media_source_player.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "media/base/android/demuxer_android.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_decoder_job.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_android.h"
-#include "media/base/clock.h"
 #include "media/base/media_export.h"
+#include "media/base/time_delta_interpolator.h"
 
 namespace media {
 
 class AudioDecoderJob;
 class VideoDecoderJob;
 
 // This class handles media source extensions on Android. It uses Android
 // MediaCodec to decode audio and video streams in two separate threads.
 class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
                                        public DemuxerAndroidClient {
@@ skipping 155 matching lines @@
 
   scoped_ptr<DemuxerAndroid> demuxer_;
 
   // Pending event that the player needs to do.
   unsigned pending_event_;
 
   // Stats about the media.
   base::TimeDelta duration_;
   bool playing_;
 
-  // base::TickClock used by |clock_|.
+  // base::TickClock used by |interpolator_|.
   base::DefaultTickClock default_tick_clock_;
 
-  // Reference clock. Keeps track of current playback time.
-  Clock clock_;
+  // Tracks the most recent media time update and provides interpolated values
+  // as playback progresses.
+  TimeDeltaInterpolator interpolator_;
 
   // Timestamps for providing simple A/V sync. When start decoding an audio
   // chunk, we record its presentation timestamp and the current system time.
   // Then we use this information to estimate when the next audio/video frame
   // should be rendered.
   // TODO(qinmin): Need to fix the problem if audio/video lagged too far behind
   // due to network or decoding problem.
   base::TimeTicks start_time_ticks_;
   base::TimeDelta start_presentation_timestamp_;
 
@@ skipping 47 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
   base::WeakPtr<MediaSourcePlayer> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_