| Index: media/base/video_codecs_unittest.cc | 
| diff --git a/media/base/video_codecs_unittest.cc b/media/base/video_codecs_unittest.cc | 
| index 15bff075d2ec919a42bef6ca95f39b59777930c2..d144c9bd163fadf79d5eea8d2988d8bb0a332f83 100644 | 
| --- a/media/base/video_codecs_unittest.cc | 
| +++ b/media/base/video_codecs_unittest.cc | 
| @@ -4,10 +4,155 @@ | 
|  | 
| #include "media/base/video_codecs.h" | 
|  | 
| +#include <set> | 
| + | 
| +#include "base/logging.h" | 
| #include "testing/gtest/include/gtest/gtest.h" | 
|  | 
| namespace media { | 
|  | 
| +TEST(ParseVP9CodecId, NewStyleVP9CodecIDs) { | 
| +  VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN; | 
| +  uint8_t level = 0; | 
| +  gfx::ColorSpace::TransferID eotf = gfx::ColorSpace::TransferID::INVALID; | 
| + | 
| +  // Old style is not subset of new style. | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp8", &profile, &level, &eotf)); | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp9", &profile, &level, &eotf)); | 
| + | 
| +  // Parsing should fail when first 4 required fields are not provided. | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09", &profile, &level, &eotf)); | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09.00", &profile, &level, &eotf)); | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09.00.01", &profile, &level, &eotf)); | 
| + | 
| +  // Expect success when all required fields supplied (and valid). | 
| +  // TrnasferID not specified by string, should default to 709. | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.00.01.08", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(VP9PROFILE_PROFILE0, profile); | 
| +  EXPECT_EQ(1, level); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::BT709, eotf); | 
| + | 
| +  // Verify profile's 1 and 2 parse correctly. | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.01.01.08", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(VP9PROFILE_PROFILE1, profile); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.08", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(VP9PROFILE_PROFILE2, profile); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.03.01.08", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(VP9PROFILE_PROFILE3, profile); | 
| +  // Profile 4 is not a thing. | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.04.01.08", &profile, &level, &eotf)); | 
| + | 
| +  // Verify valid levels parse correctly. | 
| +  const std::set<int> kValidVp9Levels = {1,  2,  3,  4,  5,  6,  11, | 
| +                                         21, 31, 41, 51, 52, 61, 62}; | 
| +  size_t num_valid_levels = 0; | 
| +  for (int i = 0; i < 99; ++i) { | 
| +    // Write "i" as the level. | 
| +    char codec_string[14]; | 
| +    snprintf(codec_string, 14, "vp09.00.%02d.08", i); | 
| +    if (kValidVp9Levels.find(i) != kValidVp9Levels.end()) { | 
| +      EXPECT_TRUE( | 
| +          ParseNewStyleVp9CodecID(codec_string, &profile, &level, &eotf)); | 
| +      EXPECT_EQ(VP9PROFILE_PROFILE0, profile); | 
| +      EXPECT_EQ(i, level); | 
| +      EXPECT_EQ(gfx::ColorSpace::TransferID::BT709, eotf); | 
| +      num_valid_levels++; | 
| +    } else { | 
| +      EXPECT_FALSE( | 
| +          ParseNewStyleVp9CodecID(codec_string, &profile, &level, &eotf)); | 
| +    } | 
| +  } | 
| +  EXPECT_EQ(kValidVp9Levels.size(), num_valid_levels); | 
| + | 
| +  // Verify bitdepths. Only 8, 10, 12 are valid. | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.8", &profile, &level, &eotf)); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10", &profile, &level, &eotf)); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.12", &profile, &level, &eotf)); | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.13", &profile, &level, &eotf)); | 
| + | 
| +  // Verify a few color profiles. | 
| +  // BT709 | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01", &profile, &level, &eotf)); | 
| +  // BT2020 | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.09", &profile, &level, &eotf)); | 
| +  // 0 is invalid. | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.00", &profile, &level, &eotf)); | 
| +  // 23 - 255 are reserved. | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.23", &profile, &level, &eotf)); | 
| + | 
| +  // Verify a few common EOTFs parse correctly. | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.01", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::BT709, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.04", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::GAMMA22, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.06", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::SMPTE170M, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.14", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::BT2020_10, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.12.01.15", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::BT2020_12, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.13", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::IEC61966_2_1, eotf); | 
| +  EXPECT_TRUE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.10.01.16", &profile, &level, &eotf)); | 
| +  EXPECT_EQ(gfx::ColorSpace::TransferID::SMPTEST2084, eotf); | 
| +  // Verify 0 and 3 are reserved EOTF values. | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.08.01.00", &profile, &level, &eotf)); | 
| +  EXPECT_FALSE( | 
| +      ParseNewStyleVp9CodecID("vp09.02.01.08.01.03", &profile, &level, &eotf)); | 
| + | 
| +  // Verify a few matrix coefficients. | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.00", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.10", &profile, | 
| +                                      &level, &eotf)); | 
| +  // Values 12 - 255 reserved. | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.12", &profile, | 
| +                                       &level, &eotf)); | 
| + | 
| +  // Verify full range flag (boolean 0 or 1). | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.01", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.02", &profile, | 
| +                                       &level, &eotf)); | 
| + | 
| +  // Verify chrome subsampling values. | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00.00", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00.01", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00.02", &profile, | 
| +                                      &level, &eotf)); | 
| +  EXPECT_TRUE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00.03", &profile, | 
| +                                      &level, &eotf)); | 
| +  // Values 4 - 7 are reserved. | 
| +  EXPECT_FALSE(ParseNewStyleVp9CodecID("vp09.02.01.10.01.01.01.00.04", &profile, | 
| +                                       &level, &eotf)); | 
| +} | 
| + | 
| #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 
| TEST(ParseHEVCCodecIdTest, InvalidHEVCCodecIds) { | 
| VideoCodecProfile profile = VIDEO_CODEC_PROFILE_UNKNOWN; | 
|  |