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 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1480 ASSERT_TRUE(WaitUntilOnEnded()); | 1480 ASSERT_TRUE(WaitUntilOnEnded()); |
1481 | 1481 |
1482 EXPECT_HASH_EQ(config.hash, GetAudioHash()); | 1482 EXPECT_HASH_EQ(config.hash, GetAudioHash()); |
1483 } | 1483 } |
1484 | 1484 |
1485 // CBR seeks should always be fast and accurate. | 1485 // CBR seeks should always be fast and accurate. |
1486 INSTANTIATE_TEST_CASE_P( | 1486 INSTANTIATE_TEST_CASE_P( |
1487 CBRSeek_HasTOC, | 1487 CBRSeek_HasTOC, |
1488 Mp3FastSeekIntegrationTest, | 1488 Mp3FastSeekIntegrationTest, |
1489 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", | 1489 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-has-TOC.mp3", |
1490 "-0.71,0.36,2.96,2.68,2.11,-1.08,"))); | 1490 "-0.71,0.36,2.96,2.68,2.10,-1.08,"))); |
watk
2017/05/04 23:24:55
This changed because it hashes all audio it's seen
| |
1491 | 1491 |
1492 INSTANTIATE_TEST_CASE_P( | 1492 INSTANTIATE_TEST_CASE_P( |
1493 CBRSeeks_NoTOC, | 1493 CBRSeeks_NoTOC, |
1494 Mp3FastSeekIntegrationTest, | 1494 Mp3FastSeekIntegrationTest, |
1495 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", | 1495 ::testing::Values(Mp3FastSeekParams("bear-audio-10s-CBR-no-TOC.mp3", |
1496 "0.95,0.56,1.34,0.47,1.77,0.84,"))); | 1496 "0.95,0.56,1.34,0.47,1.77,0.84,"))); |
1497 | 1497 |
1498 // VBR seeks can be fast *OR* accurate, but not both. We chose fast. | 1498 // VBR seeks can be fast *OR* accurate, but not both. We chose fast. |
1499 INSTANTIATE_TEST_CASE_P( | 1499 INSTANTIATE_TEST_CASE_P( |
1500 VBRSeeks_HasTOC, | 1500 VBRSeeks_HasTOC, |
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2358 | 2358 |
2359 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2359 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
2360 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2360 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
2361 Play(); | 2361 Play(); |
2362 ASSERT_TRUE(WaitUntilOnEnded()); | 2362 ASSERT_TRUE(WaitUntilOnEnded()); |
2363 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2363 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
2364 demuxer_->GetStartTime()); | 2364 demuxer_->GetStartTime()); |
2365 } | 2365 } |
2366 | 2366 |
2367 } // namespace media | 2367 } // namespace media |
OLD | NEW |