--- a/encrypted-media/encrypted-media.html Mon Apr 29 18:50:19 2013 -0700
+++ b/encrypted-media/encrypted-media.html Mon Apr 29 19:25:52 2013 -0700
@@ -13,7 +13,7 @@
.non-normative em { font-style: normal;}
.non-normative var { font-style: normal;}
</style>
- <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/w3c-ed.css">
+ <link rel="stylesheet" type="text/css" href="https://www.w3.org/StyleSheets/TR/w3c-ed.css">
</head>
<body>
<div class="head">
@@ -1340,7 +1340,7 @@
<h4 id="faq-response-needkey" class="faqquestion">What happens if a response to the <code><a href="#dom-needkey">needkey</a></code> event from the <a href="#algorithms-encrypted-stream">First Time a Key Reference is Encountered</a> is not received before <a href="#algorithms-enrypted-block">encountering an encrypted block</a>?</h4>
<p class="faqanswer">The <a href="#algorithms-enrypted-block">Encrypted Block Encountered algorithm</a> will proceed as normal.</p>
- <h4 id="faq-same-initdata-update" class="faqquestion">What if a key/license for the same <a href="#initialization-data">Initialization Data</a> (i.e. key ID) is provided more than once to <code><a href="#dom-update">update()</a></code>?</h4>
+ <h4 id="faq-same-initdata-update" class="faqquestion">What if a key/license for the same key ID is provided more than once to <code><a href="#dom-update">update()</a></code>?</h4>
<p class="faqanswer">The CDM will replace previous entries, updating the overall key ordering to reflect that this key ID was most recently added.
In other words, simply replacing the existing key data is not sufficient.
The exact algorithm is covered in <code><a href="#dom-update">update()</a></code>.
@@ -1356,13 +1356,7 @@
<p class="faqanswer">The application must use <code><a href="#dom-update">update()</a></code> to indicate the stream is encrypted and provide the key before decoding starts.</p>
<h4 id="faq-must-init-data" class="faqquestion">Must the container provide Initialization Data or a content key ID?</h4>
- <p class="faqanswer">This is ideal, but the API would also support the application sending the <a href="#initialization-data">Initialization Data</a> or ID directly to the server or providing it to the <a href="#cdm">CDM</a> via <code><a href="#dom-createsession">createSession()</a></code>.</p>
-
- <h4 id="faq-not-support-ids" class="faqquestion">What if a container/codec does not support key IDs or bit(s)?</h4>
- <p class="faqanswer">The application will need to use some other mechanism to select the appropriate key for the content.
- The user agent will only be able to use one key at a time.
- <a href="#faq-key-rotation">Key rotation</a> will be much more complex or impossible.
- </p>
+ <p class="faqanswer">Yes.</p>
<h4 id="faq-adaptive-streaming-multiple-keys" class="faqquestion">Can I use different keys for each stream (<a href="#faq-adaptive-streaming">adaptive streaming</a>)?</h4>
<p class="faqanswer">Yes, though you may want to consider the complexity and performance drawbacks. For the best user experience, you will want to provide keys for the streams to the user agent before the switch.</p>
--- a/encrypted-media/encrypted-media.xml Mon Apr 29 18:50:19 2013 -0700
+++ b/encrypted-media/encrypted-media.xml Mon Apr 29 19:25:52 2013 -0700
@@ -12,7 +12,7 @@
.non-normative em { font-style: normal;}
.non-normative var { font-style: normal;}
</style>
- <link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/w3c-ed.css"/>
+ <link rel="stylesheet" type="text/css" href="https://www.w3.org/StyleSheets/TR/w3c-ed.css"/>
</head>
<body>
<div class="head">
@@ -1289,7 +1289,7 @@
<h4 id="faq-response-needkey" class="faqquestion">What happens if a response to the <coderef>needkey</coderef> event from the <a href="#algorithms-encrypted-stream">First Time a Key Reference is Encountered</a> is not received before <a href="#algorithms-enrypted-block">encountering an encrypted block</a>?</h4>
<p class="faqanswer">The <a href="#algorithms-enrypted-block">Encrypted Block Encountered algorithm</a> will proceed as normal.</p>
- <h4 id="faq-same-initdata-update" class="faqquestion">What if a key/license for the same <a href="#initialization-data">Initialization Data</a> (i.e. key ID) is provided more than once to <methodref>update</methodref>?</h4>
+ <h4 id="faq-same-initdata-update" class="faqquestion">What if a key/license for the same key ID is provided more than once to <methodref>update</methodref>?</h4>
<p class="faqanswer">The CDM will replace previous entries, updating the overall key ordering to reflect that this key ID was most recently added.
In other words, simply replacing the existing key data is not sufficient.
The exact algorithm is covered in <methodref>update</methodref>.
@@ -1305,13 +1305,7 @@
<p class="faqanswer">The application must use <methodref>update</methodref> to indicate the stream is encrypted and provide the key before decoding starts.</p>
<h4 id="faq-must-init-data" class="faqquestion">Must the container provide Initialization Data or a content key ID?</h4>
- <p class="faqanswer">This is ideal, but the API would also support the application sending the <a href="#initialization-data">Initialization Data</a> or ID directly to the server or providing it to the <a href="#cdm">CDM</a> via <methodref>createSession</methodref>.</p>
-
- <h4 id="faq-not-support-ids" class="faqquestion">What if a container/codec does not support key IDs or bit(s)?</h4>
- <p class="faqanswer">The application will need to use some other mechanism to select the appropriate key for the content.
- The user agent will only be able to use one key at a time.
- <a href="#faq-key-rotation">Key rotation</a> will be much more complex or impossible.
- </p>
+ <p class="faqanswer">Yes.</p>
<h4 id="faq-adaptive-streaming-multiple-keys" class="faqquestion">Can I use different keys for each stream (<a href="#faq-adaptive-streaming">adaptive streaming</a>)?</h4>
<p class="faqanswer">Yes, though you may want to consider the complexity and performance drawbacks. For the best user experience, you will want to provide keys for the streams to the user agent before the switch.</p>