[EME] Remove redundant processing step from createSession().
authorDavid Dorwin <ddorwin@google.com>
Fri, 09 May 2014 14:43:28 -0700
changeset 309 055b9f0b9ecd
parent 308 3e43535939f2
child 310 30b372d9798b
[EME] Remove redundant processing step from createSession().
encrypted-media/encrypted-media.html
encrypted-media/encrypted-media.xml
--- a/encrypted-media/encrypted-media.html	Fri May 09 12:07:35 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Fri May 09 14:43:28 2014 -0700
@@ -490,9 +490,8 @@
           <li>
 <p>Use the <var title="true">cdm</var> to execute the following steps:</p>
             <ol>
-              <li><p>Process the <var>init data</var>, interpreting it per <var title="true">initDataType</var>.</p></li>
               <li>
-<p>Let <var title="true">request</var> be a request <span class="non-normative">(e.g. a license request)</span> generated by the <a href="#cdm">CDM</a> using the <var>init data</var> and <var title="true">sessionType</var>.</p>
+<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.
                 If <var title="true">sessionType</var> is "<code><a href="#dom-sessiontypepersistent">persistent</a></code>", the request is for a persistable license.</p>
                 <p class="non-normative">Note: The license server may reject the requested type. It should not issue a different type.</p>
@@ -730,12 +729,12 @@
             <ol>
               <li>
 <p>Process <var>message</var></p>
-                <p>If <var>message</var> contains keys, a license, or similar data, follow the stipulation for the first matching condition from the following list:</p>
+                <p>If <var>message</var> contains a license, key(s), or similar session data, follow the stipulation for the first matching condition from the following list:</p>
                 <dl class="switch">
                   <dt>If <var title="true">sessionType</var> is "<code><a href="#dom-sessiontypetemporary">temporary</a></code>" and the license does not specify it should be stored</dt>
-                  <dd>Do not store the license or other data contained in <var>message</var>.</dd>
+                  <dd>Do not store the license, key(s), or similar session data contained in <var>message</var>.</dd>
                   <dt>If <var title="true">sessionType</var> is "<code><a href="#dom-sessiontypepersistent">persistent</a></code>" and the license permits storage</dt>
-                  <dd>Store the license or other data contained in <var>message</var>.</dd>
+                  <dd>Store the license, key(s), or similar session data contained in <var>message</var>.</dd>
                   <dt>Otherwise</dt>
                   <dd>Fail with an appropriate <a href="#mediakeyerror-names">error name</a> and message.</dd>
                 </dl>
--- a/encrypted-media/encrypted-media.xml	Fri May 09 12:07:35 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Fri May 09 14:43:28 2014 -0700
@@ -471,8 +471,7 @@
           <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>Process the <var>init data</var>, interpreting it per <var title="true">initDataType</var>.</p></li>
-              <li><p>Let <var title="true">request</var> be a request <span class="non-normative">(e.g. a license request)</span> generated by the <a href="#cdm">CDM</a> using the <var>init data</var> and <var title="true">sessionType</var>.</p>
+              <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>
                 <p class="non-normative">Note: The license server may reject the requested type. It should not issue a different type.</p>
@@ -686,12 +685,12 @@
           <li><p>Use the <var title="true">cdm</var> to execute the following steps:</p>
             <ol>
               <li><p>Process <var>message</var></p>
-                <p>If <var>message</var> contains keys, a license, or similar data, follow the stipulation for the first matching condition from the following list:</p>
+                <p>If <var>message</var> contains a license, key(s), or similar session data, follow the stipulation for the first matching condition from the following list:</p>
                 <dl class="switch">
                   <dt>If <var title="true">sessionType</var> is "<coderef prefix="sessiontype">temporary</coderef>" and the license does not specify it should be stored</dt>
-                  <dd>Do not store the license or other data contained in <var>message</var>.</dd>
+                  <dd>Do not store the license, key(s), or similar session data contained in <var>message</var>.</dd>
                   <dt>If <var title="true">sessionType</var> is "<coderef prefix="sessiontype">persistent</coderef>" and the license permits storage</dt>
-                  <dd>Store the license or other data contained in <var>message</var>.</dd>
+                  <dd>Store the license, key(s), or similar session data contained in <var>message</var>.</dd>
                   <dt>Otherwise</dt>
                   <dd>Fail with an appropriate <a href="#mediakeyerror-names">error name</a> and message.</dd>
                 </dl>