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

Side by Side Diff: media/filters/pipeline_integration_test.cc

Issue 10535101: Replace Pipeline::SetNetworkActivity() with BufferedDataSource -> WebMediaPlayerImpl callback. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
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 "media/filters/pipeline_integration_test_base.h" 5 #include "media/filters/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/base/decoder_buffer.h" 8 #include "media/base/decoder_buffer.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 #include "media/filters/chunk_demuxer_client.h" 10 #include "media/filters/chunk_demuxer_client.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 class PipelineIntegrationTest 110 class PipelineIntegrationTest
111 : public testing::Test, 111 : public testing::Test,
112 public PipelineIntegrationTestBase { 112 public PipelineIntegrationTestBase {
113 public: 113 public:
114 void StartPipelineWithMediaSource(MockMediaSource& source) { 114 void StartPipelineWithMediaSource(MockMediaSource& source) {
115 pipeline_->Start( 115 pipeline_->Start(
116 CreateFilterCollection(&source), 116 CreateFilterCollection(&source),
117 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)), 117 base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
118 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)), 118 base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
119 NetworkEventCB(), QuitOnStatusCB(PIPELINE_OK)); 119 QuitOnStatusCB(PIPELINE_OK));
120 120
121 ASSERT_TRUE(decoder_.get()); 121 ASSERT_TRUE(decoder_.get());
122 source.set_decryptor(decryptor_.get()); 122 source.set_decryptor(decryptor_.get());
123 123
124 message_loop_.Run(); 124 message_loop_.Run();
125 } 125 }
126 126
127 // Verifies that seeking works properly for ChunkDemuxer when the 127 // Verifies that seeking works properly for ChunkDemuxer when the
128 // seek happens while there is a pending read on the ChunkDemuxer 128 // seek happens while there is a pending read on the ChunkDemuxer
129 // and no data is available. 129 // and no data is available.
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 // Verify video decoder & renderer can handle aborted demuxer reads. 244 // Verify video decoder & renderer can handle aborted demuxer reads.
245 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 245 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
246 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, 246 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
247 base::TimeDelta::FromMilliseconds(200), 247 base::TimeDelta::FromMilliseconds(200),
248 base::TimeDelta::FromMilliseconds(1668), 248 base::TimeDelta::FromMilliseconds(1668),
249 0x1C896, 65536)); 249 0x1C896, 65536));
250 } 250 }
251 251
252 } // namespace media 252 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698