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

Unified Diff: media/base/mime_util_unittest.cc

Issue 2917463002: Enable vp09 codec string in WebM by default (Closed)
Patch Set: Rebase (depends-on patch landed), browser_test tweaks Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mime_util_internal.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mime_util_unittest.cc
diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc
index c682a6b397feeea862afa51a78cccff4854dd299..9d0221b690a9b5b88446d891373372cd9b24cf48 100644
--- a/media/base/mime_util_unittest.cc
+++ b/media/base/mime_util_unittest.cc
@@ -266,7 +266,6 @@ TEST(MimeUtilTest, ParseVideoCodecString) {
}
// Valid VP9 string.
- EnableNewVp9CodecStringSupport();
EXPECT_TRUE(ParseVideoCodecString("video/webm", "vp09.00.10.08",
&out_is_ambiguous, &out_codec, &out_profile,
&out_level, &out_colorspace));
@@ -286,9 +285,6 @@ TEST(MimeUtilTest, ParseVideoCodecString) {
EXPECT_EQ(10, out_level);
EXPECT_EQ(VideoColorSpace::REC601(), out_colorspace);
- // Restore to avoid polluting other tests.
- DisableNewVp9CodecStringSupport_ForTesting();
-
// Ambiguous AVC string (when proprietary codecs are supported).
EXPECT_EQ(
kUsePropCodecs,
@@ -364,19 +360,6 @@ TEST(MimeUtilTest, ParseAudioCodecString) {
&out_codec));
}
-// See deeper string parsing testing in video_codecs_unittests.cc.
-TEST(MimeUtilTest, ExperimentalMultiPartVp9) {
-
- // Multi-part VP9 string not enabled by default.
- EXPECT_FALSE(IsSupportedMediaFormat("video/webm", {"vp09.00.10.08"}));
-
- // Should work if enabled.
- EnableNewVp9CodecStringSupport();
- EXPECT_TRUE(IsSupportedMediaFormat("video/webm", {"vp09.00.10.08"}));
- // Restore to avoid polluting other tests.
- DisableNewVp9CodecStringSupport_ForTesting();
-}
-
TEST(IsCodecSupportedOnAndroidTest, EncryptedCodecsFailWithoutPlatformSupport) {
// Vary all parameters except |has_platform_decoders|.
MimeUtil::PlatformInfo states_to_vary = VaryAllFields();
« no previous file with comments | « media/base/mime_util_internal.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698