Move underflow threshold limits out of the video renderer.

media/renderers/renderer_impl.h

 // Copyright 2014 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_RENDERERS_RENDERER_IMPL_H_
 #define MEDIA_RENDERERS_RENDERER_IMPL_H_
 
+#include "base/cancelable_callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time/clock.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "media/base/buffering_state.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_export.h"
@@ skipping 39 matching lines @@
   void StartPlayingFrom(base::TimeDelta time) final;
   void SetPlaybackRate(float playback_rate) final;
   void SetVolume(float volume) final;
   base::TimeDelta GetMediaTime() final;
   bool HasAudio() final;
   bool HasVideo() final;
 
   // Helper functions for testing purposes. Must be called before Initialize().
   void DisableUnderflowForTesting();
   void EnableClocklessVideoPlaybackForTesting();
+  void set_time_source_for_testing(TimeSource* time_source) {
+    time_source_ = time_source;
+  }
+  void set_video_underflow_threshold_for_testing(base::TimeDelta threshold) {
+    video_underflow_threshold_ = threshold;
+  }
 
  private:
   enum State {
     STATE_UNINITIALIZED,
     STATE_INITIALIZING,
     STATE_FLUSHING,
     STATE_PLAYING,
     STATE_ERROR
   };
 
@@ skipping 87 matching lines @@
   // Decryptor.
   // Note: We could have multiple filters registering this callback. One
   // callback is okay because:
   // 1, We always initialize filters in sequence.
   // 2, Filter initialization will not finish until this callback is satisfied.
   DecryptorReadyCB decryptor_ready_cb_;
 
   bool underflow_disabled_for_testing_;
   bool clockless_video_playback_enabled_for_testing_;
 
+  // Used to defer underflow for video when audio is present.
+  base::CancelableClosure deferred_underflow_cb_;
+
+  // The amount of time to wait before declaring underflow if the video renderer
+  // runs out of data but the audio renderer still has enough.
+  base::TimeDelta video_underflow_threshold_;
+
   base::WeakPtr<RendererImpl> weak_this_;
   base::WeakPtrFactory<RendererImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_RENDERER_IMPL_H_