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

Side by Side Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2349813002: EME: Update MediaKeySystemConfiguration defaults; require non-empty capabilities (Closed)
Patch Set: fix Android compile Created 4 years, 2 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
« no previous file with comments | « no previous file | media/blink/key_system_config_selector.cc » ('j') | 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 <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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // Supported media types. 55 // Supported media types.
56 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 56 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
57 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\""; 57 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
58 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\""; 58 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\"";
59 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\""; 59 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\"";
60 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\""; 60 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\"";
61 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\""; 61 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
62 #if defined(USE_PROPRIETARY_CODECS) 62 #if defined(USE_PROPRIETARY_CODECS)
63 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; 63 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
64 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; 64 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\"";
65 #endif // defined(USE_PROPRIETARY_CODECS) 65 #endif // defined(USE_PROPRIETARY_CODECS)
66 66
67 // Sessions to load. 67 // Sessions to load.
68 const char kNoSessionToLoad[] = ""; 68 const char kNoSessionToLoad[] = "";
69 const char kLoadableSession[] = "LoadableSession"; 69 const char kLoadableSession[] = "LoadableSession";
70 const char kUnknownSession[] = "UnknownSession"; 70 const char kUnknownSession[] = "UnknownSession";
71 71
72 // EME-specific test results and errors. 72 // EME-specific test results and errors.
73 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS"; 73 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS";
74 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR"; 74 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { 660 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
661 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); 661 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
662 } 662 }
663 663
664 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { 664 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
665 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, 665 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession,
666 kEmeSessionNotFound); 666 kEmeSessionNotFound);
667 } 667 }
668 668
669 #endif // defined(ENABLE_PEPPER_CDMS) 669 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | media/blink/key_system_config_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698