--- a/encrypted-media/cenc-format-respec.html Mon Jul 28 16:24:43 2014 -0700
+++ b/encrypted-media/cenc-format-respec.html Mon Jul 28 16:50:04 2014 -0700
@@ -116,13 +116,13 @@
<h2>Initialization Data and Events</h2>
<p class="issue">This section is still under discussion. See <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=17673">Bug 17673</a>.</p>
<p>Common Encryption files may contain one or more protection system specific header ('pssh') boxes, each for a unique SystemID at each location where a 'pssh' is necessary.</p>
- <p>'pssh' boxes stored in movie fragment boxes are intended to store keys referenced by KID in a sample group description contained in that movie fragment, where the KID in the sample group description overrides the default_KID specified for the track in the track encryption box ('tenc'). Each 'moof'/'pssh' must protect the contained keys with a SystemID specific method. Sample groups and 'pssh' key storage in movie fragments enable keys to be changed and accessed without interruption during playback of a track.</p>
- <p>ISO Common Encryption 2nd Edition [[!CENC-2ND]] also specifies storage of a 'pssh' box base64 encoded in an XML element of the form <cenc:pssh (base64 'pssh')>. For instance, DASH manifests may provide 'pssh' boxes in this format, each contained in a ContentProtection Descriptor element identified by a SystemID. These 'pssh' boxes may be decoded and concatenated by an application to provide equivalent Initialization Data to that stored in movie or movie fragment boxes.</p>
-
- <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes. The application may parse out 'pssh' boxes which do not correspond to the selected key system, and may not use the InitData from the file at all and instead use initData from another source (e.g. the XML element described above). The CDM must be able to filter multiple 'pssh' in the initData to find the 'pssh' box which is Key System appropriate.</p>
+ <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes. The CDM must be able to filter multiple 'pssh' in the initData to find the 'pssh' box which is Key System appropriate.</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' box(es). Multiple '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>
+
+ <p class="note">'pssh' boxes stored in movie fragment boxes are intended to store keys referenced by KID in a sample group description contained in that movie fragment, where the KID in the sample group description overrides the default_KID specified for the track in the track encryption box ('tenc'). Each 'moof'/'pssh' must protect the contained keys with a SystemID specific method. Sample groups and 'pssh' key storage in movie fragments enable keys to be changed and accessed without interruption during playback of a track.</p>
+ <p class="note">ISO Common Encryption 2nd Edition [[!CENC-2ND]] also specifies storage of a 'pssh' box base64 encoded in an XML element of the form <cenc:pssh (base64 'pssh')>. For instance, DASH manifests may provide 'pssh' boxes in this format, each contained in a ContentProtection Descriptor element identified by a SystemID. These 'pssh' boxes may be decoded and concatenated by an application to provide equivalent Initialization Data to that stored in movie or movie fragment boxes.</p>
+
</section>
<section id="common-system">
--- a/encrypted-media/cenc-format.html Mon Jul 28 16:24:43 2014 -0700
+++ b/encrypted-media/cenc-format.html Mon Jul 28 16:50:04 2014 -0700
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en" dir="ltr" typeof="bibo:Document " about="" property="dcterms:language" content="en">
+<html lang="en" dir="ltr" content="en" property="dcterms:language" about="" typeof="bibo:Document ">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>ISO Common Encryption EME Stream Format and Initialization Data</title>
@@ -206,7 +206,7 @@
</p>
<h1 class="title p-name" id="title" property="dcterms:title">ISO Common Encryption EME Stream Format and Initialization Data</h1>
- <h2 id="w3c-editor-s-draft-03-july-2014" property="dcterms:issued" content="2014-07-03T20:38:02.000Z" datatype="xsd:dateTime"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-07-03">03 July 2014</time></h2>
+ <h2 id="w3c-editor-s-draft-28-july-2014" content="2014-07-28T23:45:25.000Z" property="dcterms:issued" datatype="xsd:dateTime"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-07-28">28 July 2014</time></h2>
<dl>
<dt>This version:</dt>
@@ -227,13 +227,13 @@
<dt>Editors:</dt>
- <dd class="p-author h-card vcard" inlist="" rel="bibo:editor"><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">David Dorwin</span>, <a class="p-org org h-org h-card" href="http://www.google.com/" rel="foaf:workplaceHomepage">Google Inc.</a></span>
+ <dd class="p-author h-card vcard" rel="bibo:editor" inlist=""><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">David Dorwin</span>, <a class="p-org org h-org h-card" href="http://www.google.com/" rel="foaf:workplaceHomepage">Google Inc.</a></span>
</dd>
-<dd class="p-author h-card vcard" inlist="" rel="bibo:editor"><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Adrian Bateman</span>, <a class="p-org org h-org h-card" href="http://www.microsoft.com/" rel="foaf:workplaceHomepage">Microsoft Corporation</a></span>
+<dd class="p-author h-card vcard" rel="bibo:editor" inlist=""><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Adrian Bateman</span>, <a class="p-org org h-org h-card" href="http://www.microsoft.com/" rel="foaf:workplaceHomepage">Microsoft Corporation</a></span>
</dd>
-<dd class="p-author h-card vcard" inlist="" rel="bibo:editor"><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Mark Watson</span>, <a class="p-org org h-org h-card" href="http://www.netflix.com/" rel="foaf:workplaceHomepage">Netflix Inc.</a></span>
+<dd class="p-author h-card vcard" rel="bibo:editor" inlist=""><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Mark Watson</span>, <a class="p-org org h-org h-card" href="http://www.netflix.com/" rel="foaf:workplaceHomepage">Netflix Inc.</a></span>
</dd>
-<dd class="p-author h-card vcard" inlist="" rel="bibo:editor"><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Jerry Smith</span>, <a class="p-org org h-org h-card" href="http://www.microsoft.com/" rel="foaf:workplaceHomepage">Microsoft Corporation</a></span>
+<dd class="p-author h-card vcard" rel="bibo:editor" inlist=""><span typeof="foaf:Person"><span class="p-name fn" property="foaf:name">Jerry Smith</span>, <a class="p-org org h-org h-card" href="http://www.microsoft.com/" rel="foaf:workplaceHomepage">Microsoft Corporation</a></span>
</dd>
@@ -267,7 +267,7 @@
<hr>
</div>
<!-- TODO: Use styles for ISO boxes like the MSE registry. -->
- <section class="introductory" id="abstract" typeof="bibo:Chapter" property="dcterms:abstract" datatype="" rel="bibo:Chapter" resource="#abstract"><h2 id="h2_abstract" role="heading" aria-level="1">Abstract</h2>
+ <section class="introductory" id="abstract" property="dcterms:abstract" typeof="bibo:Chapter" datatype="" rel="bibo:Chapter" resource="#abstract"><h2 id="h2_abstract" role="heading" aria-level="1">Abstract</h2>
<p>This specification defines the stream format and initialization data for using ISO Base media File Format [<cite><a class="bibref" href="#bib-BMFF">BMFF</a></cite>] content using the ISO Common Encryption ('cenc') protection scheme [<cite><a class="bibref" href="#bib-CENC-1ST">CENC-1ST</a></cite>] with the <a href="http://www.w3.org/TR/encrypted-media/">Encrypted Media Extensions</a>.
It also defines a common SystemID and PSSH box format for use with Encrypted Media Extensions.
</p>
@@ -360,13 +360,13 @@
<!--OddPage--><h2 id="h2_init-data" role="heading" aria-level="1"><span class="secno">3. </span>Initialization Data and Events</h2>
<div class="issue"><div class="issue-title" id="h_issue_1" role="heading" aria-level="2"><span>Issue 1</span></div><p>This section is still under discussion. See <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=17673">Bug 17673</a>.</p></div>
<p>Common Encryption files may contain one or more protection system specific header ('pssh') boxes, each for a unique SystemID at each location where a 'pssh' is necessary.</p>
- <p>'pssh' boxes stored in movie fragment boxes are intended to store keys referenced by KID in a sample group description contained in that movie fragment, where the KID in the sample group description overrides the default_KID specified for the track in the track encryption box ('tenc'). Each 'moof'/'pssh' must protect the contained keys with a SystemID specific method. Sample groups and 'pssh' key storage in movie fragments enable keys to be changed and accessed without interruption during playback of a track.</p>
- <p>ISO Common Encryption 2nd Edition [<cite><a class="bibref" href="#bib-CENC-2ND">CENC-2ND</a></cite>] also specifies storage of a 'pssh' box base64 encoded in an XML element of the form <cenc:pssh (base64 'pssh')>. For instance, DASH manifests may provide 'pssh' boxes in this format, each contained in a ContentProtection Descriptor element identified by a SystemID. These 'pssh' boxes may be decoded and concatenated by an application to provide equivalent Initialization Data to that stored in movie or movie fragment boxes.</p>
-
- <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes. The application may parse out 'pssh' boxes which do not correspond to the selected key system, and may not use the InitData from the file at all and instead use initData from another source (e.g. the XML element described above). The CDM must be able to filter multiple 'pssh' in the initData to find the 'pssh' box which is Key System appropriate.</p>
+ <p><a href="encrypted-media.html#initialization-data">Initialization Data</a> is always one or more concatenated 'pssh' boxes. The CDM must be able to filter multiple 'pssh' in the initData to find the 'pssh' box which is Key System appropriate.</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' box(es). Multiple '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>
+
+ <div class="note"><div class="note-title" id="h_note_1" role="heading" aria-level="2"><span>Note</span></div><p>'pssh' boxes stored in movie fragment boxes are intended to store keys referenced by KID in a sample group description contained in that movie fragment, where the KID in the sample group description overrides the default_KID specified for the track in the track encryption box ('tenc'). Each 'moof'/'pssh' must protect the contained keys with a SystemID specific method. Sample groups and 'pssh' key storage in movie fragments enable keys to be changed and accessed without interruption during playback of a track.</p></div>
+ <div class="note"><div class="note-title" id="h_note_2" role="heading" aria-level="2"><span>Note</span></div><p>ISO Common Encryption 2nd Edition [<cite><a class="bibref" href="#bib-CENC-2ND">CENC-2ND</a></cite>] also specifies storage of a 'pssh' box base64 encoded in an XML element of the form <cenc:pssh (base64 'pssh')>. For instance, DASH manifests may provide 'pssh' boxes in this format, each contained in a ContentProtection Descriptor element identified by a SystemID. These 'pssh' boxes may be decoded and concatenated by an application to provide equivalent Initialization Data to that stored in movie or movie fragment boxes.</p></div>
+
</section>
<section id="common-system" typeof="bibo:Chapter" rel="bibo:Chapter" resource="#common-system">