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

Side by Side Diff: chrome/browser/media/encrypted_media_supported_types_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
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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 video_webm_codecs_.push_back("vp8.0"); 112 video_webm_codecs_.push_back("vp8.0");
113 video_webm_codecs_.push_back("vp9"); 113 video_webm_codecs_.push_back("vp9");
114 video_webm_codecs_.push_back("vp9.0"); 114 video_webm_codecs_.push_back("vp9.0");
115 115
116 audio_mp4_codecs_.push_back("mp4a.40.2"); 116 audio_mp4_codecs_.push_back("mp4a.40.2");
117 117
118 video_mp4_codecs_.push_back("avc1.42001E"); // Baseline profile. 118 video_mp4_codecs_.push_back("avc1.42001E"); // Baseline profile.
119 video_mp4_codecs_.push_back("avc1.4D000C"); // Main profile. 119 video_mp4_codecs_.push_back("avc1.4D000C"); // Main profile.
120 video_mp4_codecs_.push_back("avc3.64001F"); // High profile. 120 video_mp4_codecs_.push_back("avc3.64001F"); // High profile.
121 121
122 video_mp4_codecs_.push_back("vp09.00.01.08.02.01.01.00"); 122 video_mp4_codecs_.push_back("vp09.00.10.08");
123 123
124 video_mp4_hi10p_codecs_.push_back("avc1.6E001E"); // Hi10P profile 124 video_mp4_hi10p_codecs_.push_back("avc1.6E001E"); // Hi10P profile
125 125
126 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 126 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
127 video_mp4_codecs_.push_back("hvc1.1.6.L93.B0"); 127 video_mp4_codecs_.push_back("hvc1.1.6.L93.B0");
128 video_mp4_codecs_.push_back("hev1.1.6.L93.B0"); 128 video_mp4_codecs_.push_back("hev1.1.6.L93.B0");
129 #else 129 #else
130 invalid_codecs_.push_back("hvc1.1.6.L93.B0"); 130 invalid_codecs_.push_back("hvc1.1.6.L93.B0");
131 invalid_codecs_.push_back("hev1.1.6.L93.B0"); 131 invalid_codecs_.push_back("hev1.1.6.L93.B0");
132 #endif 132 #endif
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 kVideoWebMMimeType, video_webm_codecs(), kWidevine)); 780 kVideoWebMMimeType, video_webm_codecs(), kWidevine));
781 781
782 // Clear Key should still be registered. 782 // Clear Key should still be registered.
783 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType, 783 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(kVideoWebMMimeType,
784 video_webm_codecs(), kClearKey)); 784 video_webm_codecs(), kClearKey));
785 } 785 }
786 #endif // !defined(WIDEVINE_CDM_AVAILABLE) 786 #endif // !defined(WIDEVINE_CDM_AVAILABLE)
787 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 787 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
788 788
789 } // namespace chrome 789 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/media_canplaytype_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698