Remove constraint_set_flag checks from ParseH264CodecID().

content/browser/media/media_canplaytype_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
@@ skipping 589 matching lines @@
   //
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42001E\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42E00A\"'"));
   EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc1.42G01E\"'"));
 
   // The fourth digit must be 0.
   EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.42E11E\"'"));
 
   //
   // Main Profile (77 == 0x4D).
-  //  The first four digits must be 4D40.
-  //  The last two digits must be any valid level.
+  //  The first two digits must be 4D. The second two must be valid hex, but

[ddorwin, 2015/08/20 20:18:05]

The third digit must be valid hex. The fourth must be 0.

[sandersd (OOO until July 31), 2015/08/20 20:26:06]

Done.

+  //  constraint_set_flags are ignored. The last two digits must be any valid
+  //  level.
   //
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D400A\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'"));
+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D001E\"'"));

[ddorwin, 2015/08/20 20:18:05]

If 4D40 is the "canonical" version (?), we should probably continue to test that
as well.

[sandersd (OOO until July 31), 2015/08/20 20:26:06]

Not in any real sense. It's a popular way to mark videos, but the particular
digit has no meaning in this case.

It is significant when the profile (first two digits) are something else, but
that meaning has evolved as the spec has been updated and we don't currently
handle those cases. We would want tests like that if we do add such support.
(Note that such cases only increase the list of supported values, never decrease
it.)

[ddorwin, 2015/08/20 20:42:38]

If it's common, it's probably good to include here.
It's unlikely, but if someone added a check to exclude duplicate constraint bits
or something like that, such a test would catch that.

+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4DE00A\"'"));
+  EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc1.4DG01E\"'"));
 
-  // Other values are not allowed for the third and fourth digits.
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D301E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D501E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D411E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D4F1E\"'"));
+  // The fourth digit must be 0.
+  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4DE11E\"'"));
 
   //
   // High Profile (100 == 0x64).
-  //  The first four digits must be 6400.
-  //  The last two digits must be any valid level.
+  //  The first two digits must be 64. The second two must be valid hex, but

[ddorwin, 2015/08/20 20:18:05]

ditto

[sandersd (OOO until July 31), 2015/08/20 20:26:06]

Done.

+  //  constraint_set_flags are ignored. The last two digits must be any valid
+  //  level.
   //
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.64000A\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.64001E\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.64001F\"'"));
+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.64E00A\"'"));
+  EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc1.64G01E\"'"));
 
-  // Other values are not allowed for the third and fourth digits.
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.64101E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.64f01E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.64011E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.640F1E\"'"));
+  // The fourth digit must be 0.
+  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.64E11E\"'"));
 
   //
   //  Other profiles are not known to be supported.
   //
 
   // Extended Profile (88 == 0x58).
   EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.58A01E\"'"));
 }
 
 // When modifying this test, also change CodecSupportTest_Avc1Variants.
@@ skipping 26 matching lines @@
   //
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42001E\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42E00A\"'"));
   EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc3.42G01E\"'"));
 
   // The fourth digit must be 0.
   EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.42E11E\"'"));
 
   //
   // Main Profile (77 == 0x4D).
-  //  The first four digits must be 4D40.
-  //  The last two digits must be any valid level.
+  //  The first two digits must be 4D. The second two must be valid hex, but

[ddorwin, 2015/08/20 20:18:05]

same as above

[sandersd (OOO until July 31), 2015/08/20 20:26:06]

Done.

+  //  constraint_set_flags are ignored. The last two digits must be any valid
+  //  level.
   //
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.4D400A\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.4D401E\"'"));
+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.4D001E\"'"));
+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.4DE00A\"'"));
+  EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc3.4DG01E\"'"));
 
-  // Other values are not allowed for the third and fourth digits.
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.4D301E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.4D501E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.4D411E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.4D4F1E\"'"));
+  // The fourth digit must be 0.
+  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.4DE11E\"'"));
 
   //
   // High Profile (100 == 0x64).
-  //  The first four digits must be 6400.
-  //  The last two digits must be any valid level.
+  //  The first two digits must be 64. The second two must be valid hex, but
+  //  constraint_set_flags are ignored. The last two digits must be any valid
+  //  level.
   //
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64000A\"'"));
   EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001E\"'"));
-  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'"));
+  EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64E00A\"'"));
+  EXPECT_EQ(kPropMaybe,    CanPlay("'video/mp4; codecs=\"avc3.64G01E\"'"));
 
-  // Other values are not allowed for the third and fourth digits.
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64101E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64f01E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64011E\"'"));
-  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.640F1E\"'"));
+  // The fourth digit must be 0.
+  EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64E11E\"'"));
 
   //
   //  Other profiles are not known to be supported.
   //
 
   // Extended Profile (88 == 0x58).
   EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.58A01E\"'"));
 }
 
 // Tests AVC levels using AVC1 Baseline (0x42E0zz).
@@ skipping 285 matching lines @@
       CanPlay("'application/vnd.apple.mpegurl; "
               "codecs=\"avc1.42E01E, mp4a.40\"'"));
   EXPECT_EQ(maybeCanPlayHLS,
       CanPlay("'application/vnd.apple.mpegurl; "
               "codecs=\"avc3.42E01E, mp4a.40\"'"));
 
   TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
 }
 
 }  // namespace content