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

Unified Diff: media/base/mock_filters.h

Issue 10836167: Move VideoDecoder initialization into VideoRendererBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index f990f0b9b8158c128913fde05f533956171e0afc..ab9778d94d7e9421d64bfc8b4c8057aba80ee01a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -137,21 +137,23 @@ class MockVideoRenderer : public VideoRenderer {
MockVideoRenderer();
// VideoRenderer implementation.
- MOCK_METHOD9(Initialize, void(const scoped_refptr<VideoDecoder>& decoder,
- const PipelineStatusCB& init_cb,
- const StatisticsCB& statistics_cb,
- const TimeCB& time_cb,
- const NaturalSizeChangedCB& size_changed_cb,
- const base::Closure& ended_cb,
- const PipelineStatusCB& error_cb,
- const TimeDeltaCB& get_time_cb,
- const TimeDeltaCB& get_duration_cb));
+ MOCK_METHOD10(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
+ const VideoDecoderList& decoders,
+ const PipelineStatusCB& init_cb,
+ const StatisticsCB& statistics_cb,
+ const TimeCB& time_cb,
+ const NaturalSizeChangedCB& size_changed_cb,
+ const base::Closure& ended_cb,
+ const PipelineStatusCB& error_cb,
+ const TimeDeltaCB& get_time_cb,
+ const TimeDeltaCB& get_duration_cb));
MOCK_METHOD1(Play, void(const base::Closure& callback));
MOCK_METHOD1(Pause, void(const base::Closure& callback));
MOCK_METHOD1(Flush, void(const base::Closure& callback));
MOCK_METHOD2(Preroll, void(base::TimeDelta time, const PipelineStatusCB& cb));
MOCK_METHOD1(Stop, void(const base::Closure& callback));
MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
+ MOCK_METHOD0(PrepareForShutdownHack, void());
protected:
virtual ~MockVideoRenderer();
« no previous file with comments | « media/base/media_log.cc ('k') | media/base/mock_filters.cc » ('j') | media/base/pipeline.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698