[EME] Bug 24027 - Define a generic Initialization Data solution for Common Encryption.
authorDavid Dorwin <ddorwin@google.com>
Mon, 19 May 2014 12:01:53 -0700
changeset 313 3d777e556c04
parent 312 3e528bd640e3
child 314 0aecda2b15c4
[EME] Bug 24027 - Define a generic Initialization Data solution for Common Encryption.
encrypted-media/cenc-format-respec.html
encrypted-media/cenc-format.html
encrypted-media/encrypted-media.html
encrypted-media/encrypted-media.xml
encrypted-media/webm-format-respec.html
encrypted-media/webm-format.html
--- a/encrypted-media/cenc-format-respec.html	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/cenc-format-respec.html	Mon May 19 12:01:53 2014 -0700
@@ -58,14 +58,14 @@
   <body>
     <p>This specification defines the stream format and initialization data for ISO Base media File Format (ISOBMFF) content using the ISO Common Encryption ('cenc') protection scheme.</p>
 
-    <section id="cenc-stream-format">
-      <h1>Stream Format</h1>
+    <section id="stream-format">
+      <h2>Stream Format</h2>
       <p>Under the 'cenc' protection scheme, ISOBMFF content is encrypted at the sample level with AES-128 CTR encryption, according to ISO/IEC 23001-7:2012, "Information technology - MPEG system technologies - Part 7: Common encryption in ISO base media file format files". This protection method enables multiple Key Systems to decrypt the same media content.</p>
       <p>Each key is identified by a Key ID and each encrypted sample is associated with the Key ID of the key needed to decrypt it. This association is signaled either through the specification of a default Key ID in the track encryption box ('tenc') or by assigning the sample to a Sample Group, the definition of which specifies a Key ID. Common encryption files may contain a mixture of encrypted and unencrypted samples.</p>
     </section>
 
-    <section id="cenc-detect-encrypt">
-      <h1>Detecting Encryption</h1>
+    <section id="detect-encrypt">
+      <h2>Detecting Encryption</h2>
       <p>Protection scheme signaling conforms with ISO/IEC 14496-12:2012. When protection has been applied, the stream type will be transformed to 'encv' for video or 'enca' for audio, with a Protection Scheme Information Box ('sinf') added to the sample entry in the Sample Description Box ('stsd'). The Protection Scheme Information Box ('sinf') will contain a Scheme Type Box ('schm') with a scheme_type field set to a value of 'cenc' (Common Encryption).</p>
       <p>The "encrypted block" is a sample. Determining whether a sample is encrypted depends on the corresponding Track Encryption Box ('tenc') and the sample group with grouping type 'seig' (CencSampleEncryption group), if any, associated with the sample.
       The default encryption state of a sample is defined by the IsEncrypted flag in the associated track encryption box ('tenc'). This default state may be modified by the IsEncrypted flag in the SampleGroupDescriptionBox ('sgpd'), pointed to by an index in the SampleToGroupBox ('sbgp').</p>
@@ -73,13 +73,38 @@
       <p>For complete information, see ISO/IEC 23001-7:2012.</p>
     </section>
 
-    <section id="cenc-init-data">
-      <h1>Initialization Data and Events</h1>
+    <section id="init-data">
+      <h2>Initialization Data and Events</h2>
       <p>Common Encryption files may contain protection system specific header ('pssh') boxes for one or more  SystemIDs.</p>
-      <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes.
+      <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes.</p>
       <p>Each time one or more 'pssh' boxes are encountered, the <a href="encrypted-media.html#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with <var title="">initDataType</var> = "cenc" and <var title="">initData</var> = the 'pssh' boxes.
       'pssh' boxes must be provided together if and only if they appear directly next to each other in the file.
       </p>
+      <p>If a supported 'pssh' box (based on SystemID) is not found while processing the <var>initData</var> in the <code><a href="encrypted-media.html#dom-createsession">createSession()</a></code> algorithm, follow the algorithm step for "<var>init data</var> is not supported by the <var>cdm</var>."</p>
     </section>
+    
+    <section id="common-system">
+      <h2>Common SystemID and PSSH Box Format</h2>
+      <p>This section defines a common open SystemID and PSSH box format for use with EME.
+        Key System implementations supporting ISO Common Encryption should support this SystemID and format, though they may prefer another SystemID when present in the Initialization Data.
+        It is also recommended that media resources contain appropriate PSSH box(s) for this SystemID so that they may be used by any Key System implementation that supports it.</p>
+      <p><a href="encrypted-media.html#clear-key">Clear Key</a> uses this SystemID for ISO Common Encryption content.
+        When <code><a href="encrypted-media.html#dom-createsession">createSession()</a></code> is called with <var>initDataType</var> "cenc", the Clear Key CDM will use the PSSH box with this SystemID to generate a license request.
+      </p>
+      <section id="common-system-definition">
+        <h3>Definition</h3>
+        <p>The SystemID is 1077efec-c0b2-4d02-ace3-3c1e52e2fb4b.</p>
+        <p> The PSSH box format is as follows:</p>
+        <dl>
+          <dt>version</dt>
+          <dd>1</dd>
+          <dt>KID and KID_count</dt>
+          <dd>The key ID(s) represented by the PSSH box. For example, those key ID(s) used by the Movie ('moov') or Movie Fragment ('moof').</dd>
+          <dt>Data and DataSize</dt>
+          <dd>Reserved for future use. DataSize must be 0.</dd>
+        </dl>
+      </section>
+    </section>
+    
   </body>
 </html>
--- a/encrypted-media/cenc-format.html	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/cenc-format.html	Mon May 19 12:01:53 2014 -0700
@@ -123,7 +123,7 @@
   </p>
   <h1 class="title p-name" id="title" property="dcterms:title">ISO Common Encryption EME Stream Format and Initialization Data</h1>
   
-  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-13T07:07:43.000Z" id="w3c-editor-s-draft-13-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-13">13 May 2014</time></h2>
+  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-20T01:59:09.000Z" id="w3c-editor-s-draft-19-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-19">19 May 2014</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -182,14 +182,14 @@
 </div>
     <p>This specification defines the stream format and initialization data for ISO Base media File Format (ISOBMFF) content using the ISO Common Encryption ('cenc') protection scheme.</p>
 
-    <section id="cenc-stream-format" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_cenc-stream-format"><span class="secno">1. </span>Stream Format</h2>
+    <section id="stream-format" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_stream-format"><span class="secno">1. </span>Stream Format</h2>
       <p>Under the 'cenc' protection scheme, ISOBMFF content is encrypted at the sample level with AES-128 CTR encryption, according to ISO/IEC 23001-7:2012, "Information technology - MPEG system technologies - Part 7: Common encryption in ISO base media file format files". This protection method enables multiple Key Systems to decrypt the same media content.</p>
       <p>Each key is identified by a Key ID and each encrypted sample is associated with the Key ID of the key needed to decrypt it. This association is signaled either through the specification of a default Key ID in the track encryption box ('tenc') or by assigning the sample to a Sample Group, the definition of which specifies a Key ID. Common encryption files may contain a mixture of encrypted and unencrypted samples.</p>
     </section>
 
-    <section id="cenc-detect-encrypt" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_cenc-detect-encrypt"><span class="secno">2. </span>Detecting Encryption</h2>
+    <section id="detect-encrypt" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_detect-encrypt"><span class="secno">2. </span>Detecting Encryption</h2>
       <p>Protection scheme signaling conforms with ISO/IEC 14496-12:2012. When protection has been applied, the stream type will be transformed to 'encv' for video or 'enca' for audio, with a Protection Scheme Information Box ('sinf') added to the sample entry in the Sample Description Box ('stsd'). The Protection Scheme Information Box ('sinf') will contain a Scheme Type Box ('schm') with a scheme_type field set to a value of 'cenc' (Common Encryption).</p>
       <p>The "encrypted block" is a sample. Determining whether a sample is encrypted depends on the corresponding Track Encryption Box ('tenc') and the sample group with grouping type 'seig' (CencSampleEncryption group), if any, associated with the sample.
       The default encryption state of a sample is defined by the IsEncrypted flag in the associated track encryption box ('tenc'). This default state may be modified by the IsEncrypted flag in the SampleGroupDescriptionBox ('sgpd'), pointed to by an index in the SampleToGroupBox ('sbgp').</p>
@@ -197,14 +197,39 @@
       <p>For complete information, see ISO/IEC 23001-7:2012.</p>
     </section>
 
-    <section id="cenc-init-data" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_cenc-init-data"><span class="secno">3. </span>Initialization Data and Events</h2>
+    <section id="init-data" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_init-data"><span class="secno">3. </span>Initialization Data and Events</h2>
       <p>Common Encryption files may contain protection system specific header ('pssh') boxes for one or more  SystemIDs.</p>
-      <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes.
-      </p><p>Each time one or more 'pssh' boxes are encountered, the <a href="encrypted-media.html#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with <var title="">initDataType</var> = "cenc" and <var title="">initData</var> = the 'pssh' boxes.
+      <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes.</p>
+      <p>Each time one or more 'pssh' boxes are encountered, the <a href="encrypted-media.html#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with <var title="">initDataType</var> = "cenc" and <var title="">initData</var> = the 'pssh' boxes.
       'pssh' boxes must be provided together if and only if they appear directly next to each other in the file.
       </p>
+      <p>If a supported 'pssh' box (based on SystemID) is not found while processing the <var>initData</var> in the <code><a href="encrypted-media.html#dom-createsession">createSession()</a></code> algorithm, follow the algorithm step for "<var>init data</var> is not supported by the <var>cdm</var>."</p>
     </section>
+    
+    <section id="common-system" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_common-system"><span class="secno">4. </span>Common SystemID and PSSH Box Format</h2>
+      <p>This section defines a common open SystemID and PSSH box format for use with EME.
+        Key System implementations supporting ISO Common Encryption should support this SystemID and format, though they may prefer another SystemID when present in the Initialization Data.
+        It is also recommended that media resources contain appropriate PSSH box(s) for this SystemID so that they may be used by any Key System implementation that supports it.</p>
+      <p><a href="encrypted-media.html#clear-key">Clear Key</a> uses this SystemID for ISO Common Encryption content.
+        When <code><a href="encrypted-media.html#dom-createsession">createSession()</a></code> is called with <var>initDataType</var> "cenc", the Clear Key CDM will use the PSSH box with this SystemID to generate a license request.
+      </p>
+      <section id="common-system-definition" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+        <h3 aria-level="2" role="heading" id="h3_common-system-definition"><span class="secno">4.1 </span>Definition</h3>
+        <p>The SystemID is 1077efec-c0b2-4d02-ace3-3c1e52e2fb4b.</p>
+        <p> The PSSH box format is as follows:</p>
+        <dl>
+          <dt>version</dt>
+          <dd>1</dd>
+          <dt>KID and KID_count</dt>
+          <dd>The key ID(s) represented by the PSSH box. For example, those key ID(s) used by the Movie ('moov') or Movie Fragment ('moof').</dd>
+          <dt>Data and DataSize</dt>
+          <dd>Reserved for future use. DataSize must be 0.</dd>
+        </dl>
+      </section>
+    </section>
+    
   
 
 </body></html>
\ No newline at end of file
--- a/encrypted-media/encrypted-media.html	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Mon May 19 12:01:53 2014 -0700
@@ -98,7 +98,7 @@
     <div class="head">
       <p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48"></a></p>
       <h1>Encrypted Media Extensions</h1>
-      <h2 id="draft-date">W3C Editor's Draft 9 May 2014</h2>
+      <h2 id="draft-date">W3C Editor's Draft 19 May 2014</h2>
       <dl>
         <dt>This Version:</dt>
         <dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -202,7 +202,7 @@
         </ul></li>
       <li><a href="#simple-decryption">5. Simple Decryption</a></li>
         <li><ul style="list-style-type:none">
-          <li><a href="#simple-decryption-clear-key">5.1. Clear Key</a></li>
+          <li><a href="#clear-key">5.1. Clear Key</a></li>
         </ul></li>
       <li><a href="#security">6. Security Considerations</a></li>
       <li><a href="#privacy">7. Privacy Considerations</a></li>
@@ -492,6 +492,8 @@
           <li>
 <p>Use the <var title="true">cdm</var> to execute the following steps:</p>
             <ol>
+              <li><p>If the <var>init data</var> is not valid for <var title="true">initDataType</var>, reject <var>promise</var> with a new <code><a href="http://www.w3.org/TR/dom/#exception-domexception">DOMException</a></code> whose name is <code><a href="#dfn-InvalidAccessError">"InvalidAccessError"</a></code> and that has the message "Invalid initialization data."</p></li>
+              <li><p>If the <var>init data</var> is not supported by the <var title="true">cdm</var>, reject <var>promise</var> with a new <code><a href="http://www.w3.org/TR/dom/#exception-domexception">DOMException</a></code> whose name is <code><a href="#dfn-NotSupportedError">"NotSupportedError"</a></code> and that has the message "The initialization data is not supported by the key system."</p></li>
               <li>
 <p>Let <var title="true">request</var> be a request <span class="non-normative">(e.g. a license request)</span> generated based on the <var>init data</var>, which is interpreteted per <var title="true">initDataType</var>, and <var title="true">sessionType</var>.</p>
                 <p>If <var title="true">sessionType</var> is "<code><a href="#dom-sessiontypetemporary">temporary</a></code>", the request is for a temporary non-persisted license.
@@ -619,7 +621,7 @@
         <dd><pre class="code">MediaKeys.isTypeSupported("com.example.somesystem", <var title="true">initDataType</var>)</pre></dd>
         <dt>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var>, the user agent is capable of demuxing the container specified by <var title="true">mimeType</var>, and the codec(s) specified by <var title="true">mimeType</var> are supported, all as specified by capability "foo".</dt>
         <dd><pre class="code">MediaKeys.isTypeSupported("com.example.somesystem", <var title="true">initDataType</var>, <var title="true">mimeType</var>, "foo")</pre></dd>
-        <dt>Returns whether the user agent <em>probably</em> supports <a href="#simple-decryption-clear-key">Clear Key</a> using the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</dt>
+        <dt>Returns whether the user agent <em>probably</em> supports <a href="#clear-key">Clear Key</a> using the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</dt>
         <dd><pre class="code">"probably" == MediaKeys.isTypeSupported("org.w3.clearkey", <var title="true">initDataType</var>, <var title="true">mimeType</var>)</pre></dd>
       </dl>
     </div>
@@ -873,6 +875,7 @@
             The key system <em>name</em> is not supported.<br>
             The initialization data type <em>type</em> is not supported by the key system.<br>
             <em>type</em> sessions are not supported by the key system.<br>
+            The initialization data is not supported by the key system.<br>
             The operation is not supported by the key system.<br>
             The session is closed.
           </td>
@@ -885,6 +888,7 @@
           <td><dfn id="dfn-InvalidAccessError"><code>InvalidAccessError</code></dfn></td>
           <td>
             The <em>name</em> parameter is empty.<br>
+            Invalid initialization data.<br>
             The operation is not supported on <em>session type</em> sessions.
           </td>
         </tr>
@@ -1302,7 +1306,8 @@
     Thus, content providers that need only basic protection can build simple applications that will work on all platforms without needing to work with any content protection providers.</span>
     </p>
 
-    <h3 id="simple-decryption-clear-key">5.1. Clear Key</h3>
+    <a name="simple-decryption-clear-key"></a> 
+    <h3 id="clear-key">5.1. Clear Key</h3>
     <p>The "org.w3.clearkey" <a href="#key-system">Key System</a> indicates a plain-text clear (unencrypted) key will be used to decrypt the source.
     No additional client-side content protection is required.
     Use of this Key System is described below.
@@ -1461,7 +1466,7 @@
     </p>
 
     <h3 id="example-source-and-key-known" class="exampleheader">8.1. Source and Key Known at Page Load (Clear Key)</h3>
-    <p class="exampledescription">In this simple example, the source file and <a href="#simple-decryption-clear-key">clear-text license</a> are hard-coded in the page.
+    <p class="exampledescription">In this simple example, the source file and <a href="#clear-key">clear-text license</a> are hard-coded in the page.
     Only one session will ever be created.</p>
 
     <div class="example">
--- a/encrypted-media/encrypted-media.xml	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Mon May 19 12:01:53 2014 -0700
@@ -97,7 +97,7 @@
     <div class="head">
       <p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48" /></a></p>
       <h1>Encrypted Media Extensions</h1>
-      <h2 id="draft-date">W3C Editor's Draft 9 May 2014</h2>
+      <h2 id="draft-date">W3C Editor's Draft 19 May 2014</h2>
       <dl>
         <dt>This Version:</dt>
         <dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -199,7 +199,7 @@
         </ul></li>
       <li><a href="#simple-decryption">5. Simple Decryption</a></li>
         <li><ul style="list-style-type:none">
-          <li><a href="#simple-decryption-clear-key">5.1. Clear Key</a></li>
+          <li><a href="#clear-key">5.1. Clear Key</a></li>
         </ul></li>
       <li><a href="#security">6. Security Considerations</a></li>
       <li><a href="#privacy">7. Privacy Considerations</a></li>
@@ -473,6 +473,8 @@
           <li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in <methodref>create</methodref>.</p></li>
           <li><p>Use the <var title="true">cdm</var> to execute the following steps:</p>
             <ol>
+              <li><p>If the <var>init data</var> is not valid for <var title="true">initDataType</var>, reject <var>promise</var> with a new <code><dom4ref name="exception-domexception">DOMException</dom4ref></code> whose name is <code><a href="#dfn-InvalidAccessError">"InvalidAccessError"</a></code> and that has the message "Invalid initialization data."</p></li>
+              <li><p>If the <var>init data</var> is not supported by the <var title="true">cdm</var>, reject <var>promise</var> with a new <code><dom4ref name="exception-domexception">DOMException</dom4ref></code> whose name is <code><a href="#dfn-NotSupportedError">"NotSupportedError"</a></code> and that has the message "The initialization data is not supported by the key system."</p></li>
               <li><p>Let <var title="true">request</var> be a request <span class="non-normative">(e.g. a license request)</span> generated based on the <var>init data</var>, which is interpreteted per <var title="true">initDataType</var>, and <var title="true">sessionType</var>.</p>
                 <p>If <var title="true">sessionType</var> is "<coderef prefix="sessiontype">temporary</coderef>", the request is for a temporary non-persisted license.
                 If <var title="true">sessionType</var> is "<coderef prefix="sessiontype">persistent</coderef>", the request is for a persistable license.</p>
@@ -589,7 +591,7 @@
         <dd><pre class="code">MediaKeys.isTypeSupported("com.example.somesystem", <var title="true">initDataType</var>)</pre></dd>
         <dt>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var>, the user agent is capable of demuxing the container specified by <var title="true">mimeType</var>, and the codec(s) specified by <var title="true">mimeType</var> are supported, all as specified by capability "foo".</dt>
         <dd><pre class="code">MediaKeys.isTypeSupported("com.example.somesystem", <var title="true">initDataType</var>, <var title="true">mimeType</var>, "foo")</pre></dd>
-        <dt>Returns whether the user agent <em>probably</em> supports <a href="#simple-decryption-clear-key">Clear Key</a> using the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</dt>
+        <dt>Returns whether the user agent <em>probably</em> supports <a href="#clear-key">Clear Key</a> using the <a href="#initialization-data-type">initialization data type</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</dt>
         <dd><pre class="code">"probably" == MediaKeys.isTypeSupported("org.w3.clearkey", <var title="true">initDataType</var>, <var title="true">mimeType</var>)</pre></dd>
       </dl>
     </div>
@@ -822,6 +824,7 @@
             The key system <em>name</em> is not supported.<br/>
             The initialization data type <em>type</em> is not supported by the key system.<br/>
             <em>type</em> sessions are not supported by the key system.<br/>
+            The initialization data is not supported by the key system.<br/>
             The operation is not supported by the key system.<br/>
             The session is closed.
           </td>
@@ -834,6 +837,7 @@
           <td><dfn id="dfn-InvalidAccessError"><code>InvalidAccessError</code></dfn></td>
           <td>
             The <em>name</em> parameter is empty.<br/>
+            Invalid initialization data.<br/>
             The operation is not supported on <em>session type</em> sessions.
           </td>
         </tr>
@@ -1227,7 +1231,8 @@
     Thus, content providers that need only basic protection can build simple applications that will work on all platforms without needing to work with any content protection providers.</span>
     </p>
 
-    <h3 id="simple-decryption-clear-key">5.1. Clear Key</h3>
+    <a name="simple-decryption-clear-key"/> <!-- Legacy anchor name. -->
+    <h3 id="clear-key">5.1. Clear Key</h3>
     <p>The "org.w3.clearkey" <a href="#key-system">Key System</a> indicates a plain-text clear (unencrypted) key will be used to decrypt the source.
     No additional client-side content protection is required.
     Use of this Key System is described below.
@@ -1384,7 +1389,7 @@
     </p>
 
     <h3 id="example-source-and-key-known" class="exampleheader">8.1. Source and Key Known at Page Load (Clear Key)</h3>
-    <p class="exampledescription">In this simple example, the source file and <a href="#simple-decryption-clear-key">clear-text license</a> are hard-coded in the page.
+    <p class="exampledescription">In this simple example, the source file and <a href="#clear-key">clear-text license</a> are hard-coded in the page.
     Only one session will ever be created.</p>
 
     <div class="example">
--- a/encrypted-media/webm-format-respec.html	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/webm-format-respec.html	Mon May 19 12:01:53 2014 -0700
@@ -58,8 +58,8 @@
   <body>
     <p>This specification defines the stream format and initialization data for <a href="http://www.webmproject.org/code/specs/container/">WebM</a>.</p>
   
-    <section id="webm-stream-format">
-      <h1>Stream Format </h1>
+    <section id="stream-format">
+      <h2>Stream Format </h2>
       <p><a href="http://wiki.webmproject.org/encryption/webm-encryption-rfc">Encrypted WebM streams</a> are encrypted at the block level with AES-128 CTR encryption.
       The container shall include appropriate values within the <a href="http://matroska.org/technical/specs/index.html#ContentEncryption">ContentEncryption</a> element.
       </p>
@@ -69,14 +69,14 @@
       </p>
     </section>
   
-    <section id="webm-detect-encrypt">
-      <h1>Detecting Encryption</h1>
+    <section id="detect-encrypt">
+      <h2>Detecting Encryption</h2>
       <p>When a WebM <a href="http://matroska.org/technical/specs/index.html#LevelTrack">Track</a> is parsed, the presence of a <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element indicates that blocks in the track may be encrypted.
       <p><a href="encrypted-media.html#algorithms-encrypted-block">Encrypted blocks</a> are those marked encrypted by the <a href="http://wiki.webmproject.org/encryption/webm-encryption-rfc#TOC-4.6-Signal-Byte-Format">Signal Byte.</a></p>
     </section>
   
-    <section id="webm-init-data">
-      <h1>Initialization Data and Events</h1>
+    <section id="init-data">
+      <h2>Initialization Data and Events</h2>
       <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always a single key ID, as defined by the <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element of the <a href="http://matroska.org/technical/specs/index.html#LevelTrack">Track</a>.</p>
       <p>Each time a <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element is encountered, the <a href="encrypted-media.html#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with <var title="">initDataType</var> = "webm" and <var title="">initData</var> = the value in that element.</p>
     </section>
--- a/encrypted-media/webm-format.html	Mon May 12 17:18:45 2014 -0700
+++ b/encrypted-media/webm-format.html	Mon May 19 12:01:53 2014 -0700
@@ -123,7 +123,7 @@
   </p>
   <h1 class="title p-name" id="title" property="dcterms:title">WebM EME Stream Format and Initialization Data</h1>
   
-  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-13T07:17:02.000Z" id="w3c-editor-s-draft-13-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-13">13 May 2014</time></h2>
+  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-20T01:59:30.000Z" id="w3c-editor-s-draft-19-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-19">19 May 2014</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -182,8 +182,8 @@
 </div>
     <p>This specification defines the stream format and initialization data for <a href="http://www.webmproject.org/code/specs/container/">WebM</a>.</p>
   
-    <section id="webm-stream-format" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_webm-stream-format"><span class="secno">1. </span>Stream Format </h2>
+    <section id="stream-format" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_stream-format"><span class="secno">1. </span>Stream Format </h2>
       <p><a href="http://wiki.webmproject.org/encryption/webm-encryption-rfc">Encrypted WebM streams</a> are encrypted at the block level with AES-128 CTR encryption.
       The container shall include appropriate values within the <a href="http://matroska.org/technical/specs/index.html#ContentEncryption">ContentEncryption</a> element.
       </p>
@@ -193,14 +193,14 @@
       </p>
     </section>
   
-    <section id="webm-detect-encrypt" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_webm-detect-encrypt"><span class="secno">2. </span>Detecting Encryption</h2>
+    <section id="detect-encrypt" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_detect-encrypt"><span class="secno">2. </span>Detecting Encryption</h2>
       <p>When a WebM <a href="http://matroska.org/technical/specs/index.html#LevelTrack">Track</a> is parsed, the presence of a <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element indicates that blocks in the track may be encrypted.
       </p><p><a href="encrypted-media.html#algorithms-encrypted-block">Encrypted blocks</a> are those marked encrypted by the <a href="http://wiki.webmproject.org/encryption/webm-encryption-rfc#TOC-4.6-Signal-Byte-Format">Signal Byte.</a></p>
     </section>
   
-    <section id="webm-init-data" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
-      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_webm-init-data"><span class="secno">3. </span>Initialization Data and Events</h2>
+    <section id="init-data" typeof="bibo:Chapter" resource="#ref" rel="bibo:Chapter">
+      <!--OddPage--><h2 aria-level="1" role="heading" id="h2_init-data"><span class="secno">3. </span>Initialization Data and Events</h2>
       <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always a single key ID, as defined by the <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element of the <a href="http://matroska.org/technical/specs/index.html#LevelTrack">Track</a>.</p>
       <p>Each time a <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a> element is encountered, the <a href="encrypted-media.html#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with <var title="">initDataType</var> = "webm" and <var title="">initData</var> = the value in that element.</p>
     </section>