OLD | NEW |
---|---|
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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1340 Play(); | 1340 Play(); |
1341 ASSERT_TRUE(WaitUntilOnEnded()); | 1341 ASSERT_TRUE(WaitUntilOnEnded()); |
1342 | 1342 |
1343 EXPECT_HASH_EQ(config.hash, GetAudioHash()); | 1343 EXPECT_HASH_EQ(config.hash, GetAudioHash()); |
1344 } | 1344 } |
1345 | 1345 |
1346 // CBR seeks should always be fast and accurate. | 1346 // CBR seeks should always be fast and accurate. |
1347 INSTANTIATE_TEST_CASE_P( | 1347 INSTANTIATE_TEST_CASE_P( |
1348 CBRSeeks, | 1348 CBRSeeks, |
1349 Mp3FastSeekIntegrationTest, | 1349 Mp3FastSeekIntegrationTest, |
1350 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", | 1350 ::testing::Values( |
1351 "-0.71,0.36,2.96,2.68,2.10,-1.08,"), | 1351 // TODO(CHCUNNINGHAM): Re-enable for OSX once 1% flakiness is root caused. |
wolenetz
2016/01/28 23:26:46
really minor nit. in future, lower case the conten
chcunningham1
2016/01/29 01:29:33
Acknowledged.
| |
1352 Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", | 1352 // See http://crbug.com/571898 |
1353 "0.95,0.56,1.34,0.47,1.77,0.84,"))); | 1353 #if !defined(OS_MACOSX) |
wolenetz
2016/01/28 23:45:35
windows bot is complaining. macro substitution is
chcunningham1
2016/01/29 01:29:33
Done.
| |
1354 Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", | |
1355 "-0.71,0.36,2.96,2.68,2.10,-1.08,"), | |
1356 #endif | |
1357 Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", | |
1358 "0.95,0.56,1.34,0.47,1.77,0.84,"))); | |
1354 | 1359 |
1355 // VBR seeks can be fast *OR* accurate, but not both. We chose fast. | 1360 // VBR seeks can be fast *OR* accurate, but not both. We chose fast. |
1356 INSTANTIATE_TEST_CASE_P( | 1361 INSTANTIATE_TEST_CASE_P( |
1357 VBRSeeks, | 1362 VBRSeeks, |
1358 Mp3FastSeekIntegrationTest, | 1363 Mp3FastSeekIntegrationTest, |
1359 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-VBR-has-TOC.mp3", | 1364 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-VBR-has-TOC.mp3", |
1360 "-0.15,-0.83,0.54,1.00,1.94,0.93,"), | 1365 "-0.15,-0.83,0.54,1.00,1.94,0.93,"), |
1361 Mp3FastSeekParams("bear-audio-10s-VBR-no-TOC.mp3", | 1366 Mp3FastSeekParams("bear-audio-10s-VBR-no-TOC.mp3", |
1362 "-0.22,0.80,1.19,0.73,-0.31,-1.12,"))); | 1367 "-0.22,0.80,1.19,0.73,-0.31,-1.12,"))); |
1363 | 1368 |
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2004 | 2009 |
2005 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2010 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
2006 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2011 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
2007 Play(); | 2012 Play(); |
2008 ASSERT_TRUE(WaitUntilOnEnded()); | 2013 ASSERT_TRUE(WaitUntilOnEnded()); |
2009 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2014 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
2010 demuxer_->GetStartTime()); | 2015 demuxer_->GetStartTime()); |
2011 } | 2016 } |
2012 | 2017 |
2013 } // namespace media | 2018 } // namespace media |
OLD | NEW |