| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 return; | 516 return; |
| 517 #endif | 517 #endif |
| 518 if (!IsPlayBackPossible(CurrentKeySystem())) { | 518 if (!IsPlayBackPossible(CurrentKeySystem())) { |
| 519 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; | 519 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; |
| 520 return; | 520 return; |
| 521 } | 521 } |
| 522 TestFrameSizeChange(); | 522 TestFrameSizeChange(); |
| 523 } | 523 } |
| 524 | 524 |
| 525 #if defined(USE_PROPRIETARY_CODECS) | 525 #if defined(USE_PROPRIETARY_CODECS) |
| 526 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4) { | 526 // Crashes on Mac only. http://crbug.com/621857 |
| 527 #if defined(OS_MACOSX) |
| 528 #define MAYBE_Playback_VideoOnly_MP4 DISABLED_Playback_VideoOnly_MP4 |
| 529 #else |
| 530 #define MAYBE_Playback_VideoOnly_MP4 Playback_VideoOnly_MP4 |
| 531 #endif |
| 532 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_VideoOnly_MP4) { |
| 527 // MP4 without MSE is not support yet, http://crbug.com/170793. | 533 // MP4 without MSE is not support yet, http://crbug.com/170793. |
| 528 if (CurrentSourceType() != MSE) { | 534 if (CurrentSourceType() != MSE) { |
| 529 DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE."; | 535 DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE."; |
| 530 return; | 536 return; |
| 531 } | 537 } |
| 532 TestSimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly); | 538 TestSimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly); |
| 533 } | 539 } |
| 534 | 540 |
| 535 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) { | 541 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_MP4) { |
| 536 // MP4 without MSE is not support yet, http://crbug.com/170793. | 542 // MP4 without MSE is not support yet, http://crbug.com/170793. |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 | 631 |
| 626 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { | 632 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { |
| 627 TestPlaybackCase(kLoadableSession, kEnded); | 633 TestPlaybackCase(kLoadableSession, kEnded); |
| 628 } | 634 } |
| 629 | 635 |
| 630 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { | 636 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { |
| 631 TestPlaybackCase(kUnknownSession, kEmeSessionNotFound); | 637 TestPlaybackCase(kUnknownSession, kEmeSessionNotFound); |
| 632 } | 638 } |
| 633 | 639 |
| 634 #endif // defined(ENABLE_PEPPER_CDMS) | 640 #endif // defined(ENABLE_PEPPER_CDMS) |
| OLD | NEW |