[EME] Bug 24323 - Rename 'First Time a Key Reference is Encountered' algorithm and remove key ID checks from Container Guidelines subsections
--- a/encrypted-media/encrypted-media.html Fri Feb 21 14:42:45 2014 -0800
+++ b/encrypted-media/encrypted-media.html Fri Feb 21 14:57:14 2014 -0800
@@ -184,7 +184,7 @@
</ul></li>
<li><a href="#algorithms">4. Algorithms</a></li>
<li><ul style="list-style-type:none">
- <li><a href="#algorithms-encrypted-stream">4.1. First Time a Key Reference is Encountered</a></li>
+ <li><a href="#algorithms-initdata-encountered">4.1. Initialization Data Encountered</a></li>
<li><a href="#algorithms-encrypted-block">4.2. Encrypted Block Encountered</a></li>
<li><a href="#algorithms-queue-message">4.3. Queue a "message" Event</a></li>
<li><a href="#algorithms-session-close">4.4. Session Close</a></li>
@@ -926,7 +926,7 @@
<h2 id="algorithms">4. Algorithms</h2>
- <h3 id="algorithms-encrypted-stream">4.1. First Time a Key Reference is Encountered</h3>
+ <h3 id="algorithms-initdata-encountered">4.1. Initialization Data Encountered</h3>
<p>The following steps are run when the <a href="#media-element">media element</a> encounters a source that may contain encrypted blocks or streams during the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#concept-media-load-resource">resource fetch algorithm</a>:</p>
<ol>
@@ -1234,7 +1234,7 @@
In the latter case, a subset of the blocks within a Track containing a <a href="http://matroska.org/technical/specs/index.html#ContentEncryption">ContentEncryption</a> element are marked as encrypted.</p>
<h4 id="webm-detect-encrypt">8.1.2. Detecting Encryption</h4>
- <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 shall indicate that the stream is potentially encrypted. Each time a new value is encountered in a ContentEncKeyID element, the <a href="#algorithms-encrypted-stream">First Time a Key Reference is Encountered</a> algorithm shall be invoked with the value in that element as <var title="">initData</var>.</p>
+ <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 shall indicate that the stream is potentially encrypted. Each time a new value is encountered in a ContentEncKeyID element, the <a href="#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with the value in that element as <var title="">initData</var>.</p>
<p><a href="#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>
@@ -1247,7 +1247,7 @@
However, if supported by the key system, multiple key IDs may be bundled by the application before requesting a key and multiple key ID-key pairs may be returned by the license server.
</p>
- <p>An event will be fired for each new key ID (in <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a>) encountered for which a key is not already known.</p>
+ <p>An event will be fired for each new key ID (in <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a>) encountered.</p>
</div>
<h3 id="iso">8.2 ISO Base Media File Format</h3>
--- a/encrypted-media/encrypted-media.xml Fri Feb 21 14:42:45 2014 -0800
+++ b/encrypted-media/encrypted-media.xml Fri Feb 21 14:57:14 2014 -0800
@@ -181,7 +181,7 @@
</ul></li>
<li><a href="#algorithms">4. Algorithms</a></li>
<li><ul style="list-style-type:none">
- <li><a href="#algorithms-encrypted-stream">4.1. First Time a Key Reference is Encountered</a></li>
+ <li><a href="#algorithms-initdata-encountered">4.1. Initialization Data Encountered</a></li>
<li><a href="#algorithms-encrypted-block">4.2. Encrypted Block Encountered</a></li>
<li><a href="#algorithms-queue-message">4.3. Queue a "message" Event</a></li>
<li><a href="#algorithms-session-close">4.4. Session Close</a></li>
@@ -887,7 +887,7 @@
<h2 id="algorithms">4. Algorithms</h2>
- <h3 id="algorithms-encrypted-stream">4.1. First Time a Key Reference is Encountered</h3>
+ <h3 id="algorithms-initdata-encountered">4.1. Initialization Data Encountered</h3>
<p>The following steps are run when the <a href="#media-element">media element</a> encounters a source that may contain encrypted blocks or streams during the <resource-fetch-algorithm/>:</p>
<ol>
@@ -1183,7 +1183,7 @@
In the latter case, a subset of the blocks within a Track containing a <a href="http://matroska.org/technical/specs/index.html#ContentEncryption">ContentEncryption</a> element are marked as encrypted.</p>
<h4 id="webm-detect-encrypt">8.1.2. Detecting Encryption</h4>
- <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 shall indicate that the stream is potentially encrypted. Each time a new value is encountered in a ContentEncKeyID element, the <a href="#algorithms-encrypted-stream">First Time a Key Reference is Encountered</a> algorithm shall be invoked with the value in that element as <var title="">initData</var>.</p>
+ <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 shall indicate that the stream is potentially encrypted. Each time a new value is encountered in a ContentEncKeyID element, the <a href="#algorithms-initdata-encountered">Initialization Data Encountered</a> algorithm shall be invoked with the value in that element as <var title="">initData</var>.</p>
<p><a href="#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>
@@ -1196,7 +1196,7 @@
However, if supported by the key system, multiple key IDs may be bundled by the application before requesting a key and multiple key ID-key pairs may be returned by the license server.
</p>
- <p>An event will be fired for each new key ID (in <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a>) encountered for which a key is not already known.</p>
+ <p>An event will be fired for each new key ID (in <a href="http://matroska.org/technical/specs/index.html#ContentEncKeyID">ContentEncKeyID</a>) encountered.</p>
</div>
<h3 id="iso">8.2 ISO Base Media File Format</h3>