Merge pull request #144 from w3c/encryption_scheme

Add encryption scheme to KeySystemTrackConfiguration
w3c · Jan 26, 2020 · d573555 · d573555
2 parents 8ef8c67 + c68b503
commit d573555
Showing 1 changed file with 38 additions and 4 deletions.
diff --git a/index.bs b/index.bs
@@ -92,6 +92,10 @@ spec: encrypted-media; for: EME; urlPrefix: https://www.w3.org/TR/encrypted-medi
         text: audioCapabilities; url: dom-mediakeysystemconfiguration-audiocapabilities
         text: contentType; url: dom-mediakeysystemmediacapability-contenttype
 
+spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypted-media/#
+    type: attribute
+        text: encryptionScheme; url: dom-mediakeysystemmediacapability-encryptionscheme
+
 spec: secure-contexts; urlPrefix: https://www.w3.org/TR/secure-contexts/
     type: dfn; text: Is the environment settings object settings a secure context?; url: #settings-object
 
@@ -121,6 +125,12 @@ spec: workers; urlPrefix: https://www.w3.org/TR/workers/#
         "publisher": "SMPTE",
         "date": "2016",
         "id": "SMPTE-ST-2094"
+    },
+    "ENCRYPTED-MEDIA-DRAFT": {
+        "href": "https://w3c.github.io/encrypted-media",
+        "title": "Encrypted Media Extensions",
+        "publisher": "W3C",
+        "date": "13 December 2019"
     }
 }
 </pre>
@@ -690,6 +700,7 @@ spec: workers; urlPrefix: https://www.w3.org/TR/workers/#
       <xmp>
         dictionary KeySystemTrackConfiguration {
           DOMString robustness = "";
+          DOMString? encryptionScheme = null;
         };
       </xmp>
     </pre>
@@ -698,6 +709,11 @@ spec: workers; urlPrefix: https://www.w3.org/TR/workers/#
       The <dfn for='KeySystemTrackConfiguration' dict-member>robustness</dfn>
       member represents a {{EME/robustness}} level as described in [[!ENCRYPTED-MEDIA]].
     </p>
+
+    <p>
+      The <dfn for='KeySystemTrackConfiguration' dict-member>encryptionScheme</dfn>
+      member represents an {{EME/encryptionScheme}} as described in [[!ENCRYPTED-MEDIA-DRAFT]].
+    </p>
   </section>
 
   <section>
@@ -954,7 +970,17 @@ spec: workers; urlPrefix: https://www.w3.org/TR/workers/#
                   </li>
                   <li>
                     If <code>config.keySystemConfiguration.audio</code>
-                    is <a>present</a>, set the {{EME/robustness}} attribute to <code>config.keySystemConfiguration.audio.robustness</code>.
+                    is <a>present</a>:
+                    <ol>
+                      <li>
+                        Set the {{EME/robustness}} attribute to <code>
+                        config.keySystemConfiguration.audio.robustness</code>
+                      </li>
+                      <li>
+                        Set the {{EME/encryptionScheme}} attribute to <code>
+                        config.keySystemConfiguration.audio.encryptionScheme</code>
+                      </li>
+                    </ol>
                   </li>
                 </ol>
               </li>
@@ -968,9 +994,17 @@ spec: workers; urlPrefix: https://www.w3.org/TR/workers/#
                     <code>config.video.contentType</code>.
                   </li>
                   <li>
-                    If <code>config.keySystemConfiguration.video</code> is <a>present</a>, set the
-                    {{EME/robustness}} attribute to 
-                    <code>config.keySystemConfiguration.video.robustness</code>.
+                    If <code>config.keySystemConfiguration.video</code> is <a>present</a>:
+                    <ol>
+                      <li>
+                        Set the {{EME/robustness}} attribute to <code>
+                        config.keySystemConfiguration.video.robustness</code>.
+                      </li>
+                      <li>
+                        Set the {{EME/encryptionScheme}} attribute to <code>
+                        config.keySystemConfiguration.video.encryptionScheme</code>
+                      </li>
+                    </ol>
                   </li>
                 </ol>
               </li>