| 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 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 1363 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 1364 | 1364 |
| 1365 TEST_F(PipelineIntegrationTest, BasicPlaybackHi10P) { | 1365 TEST_F(PipelineIntegrationTest, BasicPlaybackHi10P) { |
| 1366 ASSERT_EQ(PIPELINE_OK, Start("bear-320x180-hi10p.mp4", kClockless)); | 1366 ASSERT_EQ(PIPELINE_OK, Start("bear-320x180-hi10p.mp4", kClockless)); |
| 1367 | 1367 |
| 1368 Play(); | 1368 Play(); |
| 1369 | 1369 |
| 1370 ASSERT_TRUE(WaitUntilOnEnded()); | 1370 ASSERT_TRUE(WaitUntilOnEnded()); |
| 1371 } | 1371 } |
| 1372 | 1372 |
| 1373 ScopedVector<VideoDecoder> CreateFailingVideoDecoder() { | 1373 std::vector<std::unique_ptr<VideoDecoder>> CreateFailingVideoDecoder() { |
| 1374 ScopedVector<VideoDecoder> failing_video_decoder; | 1374 std::vector<std::unique_ptr<VideoDecoder>> failing_video_decoder; |
| 1375 failing_video_decoder.push_back(new FailingVideoDecoder()); | 1375 failing_video_decoder.push_back(base::MakeUnique<FailingVideoDecoder>()); |
| 1376 return failing_video_decoder; | 1376 return failing_video_decoder; |
| 1377 } | 1377 } |
| 1378 | 1378 |
| 1379 TEST_F(PipelineIntegrationTest, BasicFallback) { | 1379 TEST_F(PipelineIntegrationTest, BasicFallback) { |
| 1380 ASSERT_EQ(PIPELINE_OK, Start("bear.mp4", kClockless, | 1380 ASSERT_EQ(PIPELINE_OK, Start("bear.mp4", kClockless, |
| 1381 base::Bind(&CreateFailingVideoDecoder))); | 1381 base::Bind(&CreateFailingVideoDecoder))); |
| 1382 | 1382 |
| 1383 Play(); | 1383 Play(); |
| 1384 | 1384 |
| 1385 ASSERT_TRUE(WaitUntilOnEnded()); | 1385 ASSERT_TRUE(WaitUntilOnEnded()); |
| (...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2359 | 2359 |
| 2360 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { | 2360 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { |
| 2361 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); | 2361 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); |
| 2362 Play(); | 2362 Play(); |
| 2363 ASSERT_TRUE(WaitUntilOnEnded()); | 2363 ASSERT_TRUE(WaitUntilOnEnded()); |
| 2364 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), | 2364 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), |
| 2365 demuxer_->GetStartTime()); | 2365 demuxer_->GetStartTime()); |
| 2366 } | 2366 } |
| 2367 | 2367 |
| 2368 } // namespace media | 2368 } // namespace media |
| OLD | NEW |