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

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

Issue 2847533002: Update mp4 vp9 test files to follow v1.0 spec (Closed)
Patch Set: Created 3 years, 7 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
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/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // Supported media types. 75 // Supported media types.
76 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 76 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
77 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\""; 77 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
78 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\""; 78 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\"";
79 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\""; 79 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\"";
80 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\""; 80 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\"";
81 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\""; 81 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
82 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 82 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
83 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; 83 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
84 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\""; 84 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\"";
85 85 const char kMP4VideoVp9Only[] =
86 // NOTE: This string originally signalled the SMPTEST2084 EOTF, but is now 86 "video/mp4; codecs=\"vp09.00.10.08.01.02.02.02.00\"";
87 // signalling BT709. At this time 2084 is only allowed when run with
88 // --enable-hdr, and thats not really the focus of this test.
89 // TODO(kqyang): update content to not use HDR transfer.
90 const char kMP4VideoVp9Only[] = "video/mp4; codecs=\"vp09.00.10.08.01.01.01\"";
91 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 87 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
92 88
93 // Sessions to load. 89 // Sessions to load.
94 const char kNoSessionToLoad[] = ""; 90 const char kNoSessionToLoad[] = "";
95 const char kLoadableSession[] = "LoadableSession"; 91 const char kLoadableSession[] = "LoadableSession";
96 const char kUnknownSession[] = "UnknownSession"; 92 const char kUnknownSession[] = "UnknownSession";
97 93
98 // EME-specific test results and errors. 94 // EME-specific test results and errors.
99 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS"; 95 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS";
100 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR"; 96 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 736 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
741 737
742 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 738 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
743 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { 739 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
744 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, 740 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
745 kUnitTestSuccess); 741 kUnitTestSuccess);
746 } 742 }
747 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 743 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
748 744
749 } // namespace chrome 745 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698