[EME] Bug 17673 - Minor corrections to CENC format.
authorDavid Dorwin <ddorwin@google.com>
Tue, 06 May 2014 14:25:56 -0700
changeset 305 bf4b3f85e6ba
parent 304 702cf19177e0
child 306 5a3cac55ca65
[EME] Bug 17673 - Minor corrections to CENC format.
encrypted-media/cenc-format-respec.html
encrypted-media/cenc-format.html
--- a/encrypted-media/cenc-format-respec.html	Tue May 06 08:22:40 2014 -0700
+++ b/encrypted-media/cenc-format-respec.html	Tue May 06 14:25:56 2014 -0700
@@ -68,7 +68,7 @@
     <section id="cenc-detect-encrypt">
       <h1>Detecting Encryption</h1>
       <p>Protection scheme signaling conforms with ISO/IEC 14496-12. 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 Group Type 'seig' (CencSampleEncryption group entry), if any, associated with the sample.
+      <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>
       <p>Samples can be partially encrypted, specified by subsample information referenced by SampleAuxiliaryInformationSizesBox (‘saiz’) and SampleAuxiliaryInformationOffsetsBox ('saio') boxes.</p>
       <p>For complete information, see ISO/IEC 23001-7:2012.</p>
--- a/encrypted-media/cenc-format.html	Tue May 06 08:22:40 2014 -0700
+++ b/encrypted-media/cenc-format.html	Tue May 06 14:25:56 2014 -0700
@@ -162,7 +162,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-06T22:20:40.000Z" id="w3c-editor-s-draft-06-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-06">06 May 2014</time></h2>
+  <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-05-07T04:24:00.000Z" id="w3c-editor-s-draft-06-may-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-05-06">06 May 2014</time></h2>
   <dl>
     
       <dt>This version:</dt>
@@ -231,7 +231,7 @@
     <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>
       <p>Protection scheme signaling conforms with ISO/IEC 14496-12. 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 Group Type 'seig' (CencSampleEncryption group entry), if any, associated with the sample.
+      <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>
       <p>Samples can be partially encrypted, specified by subsample information referenced by SampleAuxiliaryInformationSizesBox (‘saiz’) and SampleAuxiliaryInformationOffsetsBox ('saio') boxes.</p>
       <p>For complete information, see ISO/IEC 23001-7:2012.</p>