Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: media/filters/audio_renderer_base.h

Issue 9347029: Decouple 'give me more data' and 'rendered end of stream' audio callbacks. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/audio_renderer_base.h
===================================================================
--- media/filters/audio_renderer_base.h (revision 122285)
+++ media/filters/audio_renderer_base.h (working copy)
@@ -21,6 +21,7 @@
#include <deque>
+#include "base/gtest_prod_util.h"
#include "base/synchronization/lock.h"
#include "media/base/audio_decoder.h"
#include "media/base/buffers.h"
@@ -52,6 +53,8 @@
protected:
FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, EndOfStream);
FRIEND_TEST_ALL_PREFIXES(AudioRendererBaseTest, Underflow_EndOfStream);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, OnRenderEndOfStream);
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, OnRenderEndOfStreamStopped);
// Subclasses should return true if they were able to initialize, false
// otherwise.
@@ -99,13 +102,19 @@
const base::TimeDelta& playback_delay);
// Called by OnRenderEndOfStream() or some callback scheduled by derived class
- // to signal end of stream.
- void SignalEndOfStream();
+ // to signal end of stream. Made virtual so tests can override.
+ virtual void SignalEndOfStream();
// Get/Set the playback rate of |algorithm_|.
virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
virtual float GetPlaybackRate();
+ // Accessor used by tests. Made protected, not private,
+ // so tests for derived classes can use it.
+ void set_recieved_end_of_stream(bool recieved_end_of_stream) {
+ recieved_end_of_stream_ = recieved_end_of_stream;
+ }
+
private:
friend class AudioRendererBaseTest;

Powered by Google App Engine
This is Rietveld 408576698