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

Side by Side Diff: media/base/pipeline_unittest.cc

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « media/base/mock_filters.cc ('k') | media/base/stream_parser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/test/simple_test_tick_clock.h" 10 #include "base/test/simple_test_tick_clock.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 renderer_(scoped_renderer_.get()) { 92 renderer_(scoped_renderer_.get()) {
93 // SetDemuxerExpectations() adds overriding expectations for expected 93 // SetDemuxerExpectations() adds overriding expectations for expected
94 // non-NULL streams. 94 // non-NULL streams.
95 DemuxerStream* null_pointer = NULL; 95 DemuxerStream* null_pointer = NULL;
96 EXPECT_CALL(*demuxer_, GetStream(_)) 96 EXPECT_CALL(*demuxer_, GetStream(_))
97 .WillRepeatedly(Return(null_pointer)); 97 .WillRepeatedly(Return(null_pointer));
98 98
99 EXPECT_CALL(*demuxer_, GetTimelineOffset()) 99 EXPECT_CALL(*demuxer_, GetTimelineOffset())
100 .WillRepeatedly(Return(base::Time())); 100 .WillRepeatedly(Return(base::Time()));
101 101
102 EXPECT_CALL(*demuxer_, GetLiveness())
103 .WillRepeatedly(Return(Demuxer::LIVENESS_UNKNOWN));
104
105 EXPECT_CALL(*renderer_, GetMediaTime()) 102 EXPECT_CALL(*renderer_, GetMediaTime())
106 .WillRepeatedly(Return(base::TimeDelta())); 103 .WillRepeatedly(Return(base::TimeDelta()));
107 104
108 EXPECT_CALL(*demuxer_, GetStartTime()).WillRepeatedly(Return(start_time_)); 105 EXPECT_CALL(*demuxer_, GetStartTime()).WillRepeatedly(Return(start_time_));
109 } 106 }
110 107
111 virtual ~PipelineTest() { 108 virtual ~PipelineTest() {
112 if (!pipeline_ || !pipeline_->IsRunning()) 109 if (!pipeline_ || !pipeline_->IsRunning())
113 return; 110 return;
114 111
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 992
996 INSTANTIATE_TEARDOWN_TEST(Error, InitDemuxer); 993 INSTANTIATE_TEARDOWN_TEST(Error, InitDemuxer);
997 INSTANTIATE_TEARDOWN_TEST(Error, InitRenderer); 994 INSTANTIATE_TEARDOWN_TEST(Error, InitRenderer);
998 INSTANTIATE_TEARDOWN_TEST(Error, Flushing); 995 INSTANTIATE_TEARDOWN_TEST(Error, Flushing);
999 INSTANTIATE_TEARDOWN_TEST(Error, Seeking); 996 INSTANTIATE_TEARDOWN_TEST(Error, Seeking);
1000 INSTANTIATE_TEARDOWN_TEST(Error, Playing); 997 INSTANTIATE_TEARDOWN_TEST(Error, Playing);
1001 998
1002 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing); 999 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing);
1003 1000
1004 } // namespace media 1001 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filters.cc ('k') | media/base/stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698