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

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

Issue 10382200: Update WebMClusterParser to compute durations for all StreamParserBuffers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments Created 8 years, 7 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
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/webm/webm_cluster_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 "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/test_data_util.h" 8 #include "media/base/test_data_util.h"
9 #include "media/filters/chunk_demuxer_client.h" 9 #include "media/filters/chunk_demuxer_client.h"
10 10
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 // Make sure seeking after reaching the end works as expected. 220 // Make sure seeking after reaching the end works as expected.
221 ASSERT_TRUE(Seek(seek_time)); 221 ASSERT_TRUE(Seek(seek_time));
222 EXPECT_GE(pipeline_->GetCurrentTime(), seek_time); 222 EXPECT_GE(pipeline_->GetCurrentTime(), seek_time);
223 ASSERT_TRUE(WaitUntilOnEnded()); 223 ASSERT_TRUE(WaitUntilOnEnded());
224 } 224 }
225 225
226 // Verify audio decoder & renderer can handle aborted demuxer reads. 226 // Verify audio decoder & renderer can handle aborted demuxer reads.
227 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) { 227 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
228 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", 8192, 228 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", 8192,
229 base::TimeDelta::FromMilliseconds(477), 229 base::TimeDelta::FromMilliseconds(464),
230 base::TimeDelta::FromMilliseconds(617), 230 base::TimeDelta::FromMilliseconds(617),
231 0x10CA, 19730)); 231 0x10CA, 19730));
232 } 232 }
233 233
234 // Verify video decoder & renderer can handle aborted demuxer reads. 234 // Verify video decoder & renderer can handle aborted demuxer reads.
235 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 235 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
236 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, 236 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
237 base::TimeDelta::FromMilliseconds(200), 237 base::TimeDelta::FromMilliseconds(200),
238 base::TimeDelta::FromMilliseconds(1668), 238 base::TimeDelta::FromMilliseconds(1668),
239 0x1C896, 65536)); 239 0x1C896, 65536));
240 } 240 }
241 241
242 } // namespace media 242 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/webm/webm_cluster_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698