Source release 18.5.0

cdm/include/cdm.h

@@ -137,11 +137,16 @@ class CDM_EXPORT Cdm : public ITimerClient {
   // For ease of comparison, these values are kept in ascending order by version
   // number.
   enum HdcpVersion : int32_t {
-    kHdcp1_x = 0,
-    kHdcp2_0 = 1,
-    kHdcp2_1 = 2,
-    kHdcp2_2 = 3,
-    kHdcp2_3 = 4,
+    kHdcp1_x = 0,  // Any 1.x version
+    kHdcp1_0 = 100,
+    kHdcp1_1 = 101,
+    kHdcp1_2 = 102,
+    kHdcp1_3 = 103,
+    kHdcp1_4 = 104,
+    kHdcp2_0 = 200,
+    kHdcp2_1 = 201,
+    kHdcp2_2 = 202,
+    kHdcp2_3 = 203
   };
 
   // Permissible usages for a key. Returned as a set of flags; multiple