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

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

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