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

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 23454016: Mark failing MediaSourcePlayerTest.CanPlayType_Widevine as DISABLED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "media/base/android/media_codec_bridge.h" 10 #include "media/base/android/media_codec_bridge.h"
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 manager_->message_loop()->Run(); 499 manager_->message_loop()->Run();
500 EXPECT_EQ(2, manager_->num_requests()); 500 EXPECT_EQ(2, manager_->num_requests());
501 501
502 // Send EOS. 502 // Send EOS.
503 player_->ReadFromDemuxerAck(CreateEOSAck(false)); 503 player_->ReadFromDemuxerAck(CreateEOSAck(false));
504 manager_->message_loop()->Run(); 504 manager_->message_loop()->Run();
505 // No more request for data should be made. 505 // No more request for data should be made.
506 EXPECT_EQ(2, manager_->num_requests()); 506 EXPECT_EQ(2, manager_->num_requests());
507 } 507 }
508 508
509 TEST_F(MediaSourcePlayerTest, CanPlayType_Widevine) { 509 // Crashes. http://crbug.com/287817
510 TEST_F(MediaSourcePlayerTest, DISABLED_CanPlayType_Widevine) {
510 if (!MediaCodecBridge::IsAvailable() || !MediaDrmBridge::IsAvailable()) 511 if (!MediaCodecBridge::IsAvailable() || !MediaDrmBridge::IsAvailable())
511 return; 512 return;
512 513
513 uint8 kWidevineUUID[] = { 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE, 514 uint8 kWidevineUUID[] = { 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
514 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED }; 515 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
515 516
516 std::vector<uint8> widevine_uuid(kWidevineUUID, 517 std::vector<uint8> widevine_uuid(kWidevineUUID,
517 kWidevineUUID + arraysize(kWidevineUUID)); 518 kWidevineUUID + arraysize(kWidevineUUID));
518 519
519 std::vector<std::string> codec_avc(1, "avc1"); 520 std::vector<std::string> codec_avc(1, "avc1");
(...skipping 22 matching lines...) Expand all
542 543
543 std::vector<std::string> codec_avc(1, "avc1"); 544 std::vector<std::string> codec_avc(1, "avc1");
544 EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L3", "video/mp4", codec_avc)); 545 EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L3", "video/mp4", codec_avc));
545 EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L1", "video/mp4", codec_avc)); 546 EXPECT_FALSE(IsTypeSupported(invalid_uuid, "L1", "video/mp4", codec_avc));
546 } 547 }
547 548
548 // TODO(xhwang): Are these IsTypeSupported tests device specific? 549 // TODO(xhwang): Are these IsTypeSupported tests device specific?
549 // TODO(xhwang): Add more IsTypeSupported tests. 550 // TODO(xhwang): Add more IsTypeSupported tests.
550 551
551 } // namespace media 552 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698