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

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: Address build breaks on some configs 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
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_supported_types_browsertest.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/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Supported media types. 76 // Supported media types.
77 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 77 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
78 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\""; 78 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
79 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\""; 79 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\"";
80 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\""; 80 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\"";
81 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\""; 81 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\"";
82 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\""; 82 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
83 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 83 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
84 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; 84 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
85 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\""; 85 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\"";
86 86 const char kMP4VideoVp9Only[] =
87 // NOTE: This string originally signalled the SMPTEST2084 EOTF, but is now 87 "video/mp4; codecs=\"vp09.00.10.08.01.02.02.02.00\"";
88 // signalling BT709. At this time 2084 is only allowed when run with
89 // --enable-hdr, and thats not really the focus of this test.
90 // TODO(kqyang): update content to not use HDR transfer.
91 const char kMP4VideoVp9Only[] = "video/mp4; codecs=\"vp09.00.10.08.01.01.01\"";
92 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 88 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
93 89
94 // Sessions to load. 90 // Sessions to load.
95 const char kNoSessionToLoad[] = ""; 91 const char kNoSessionToLoad[] = "";
96 const char kLoadableSession[] = "LoadableSession"; 92 const char kLoadableSession[] = "LoadableSession";
97 const char kUnknownSession[] = "UnknownSession"; 93 const char kUnknownSession[] = "UnknownSession";
98 94
99 // EME-specific test results and errors. 95 // EME-specific test results and errors.
100 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS"; 96 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS";
101 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR"; 97 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 739 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
744 740
745 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 741 #if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
746 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) { 742 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, VerifyCdmHostTest) {
747 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem, 743 TestNonPlaybackCases(kExternalClearKeyVerifyCdmHostTestKeySystem,
748 kUnitTestSuccess); 744 kUnitTestSuccess);
749 } 745 }
750 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) 746 #endif // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
751 747
752 } // namespace chrome 748 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/encrypted_media_supported_types_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698