[e] (0) Try to elaborate on why the UA might pick particular media tr…

…acks Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=24895 Affected topics: Video and Audio git-svn-id: http://svn.whatwg.org/webapps@8543 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Mar 13, 2014 · c12bc2d · c12bc2d
1 parent 20d7492
commit c12bc2d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/complete.html b/complete.html
@@ -298,7 +298,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 March 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 13 March 2014</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -25529,7 +25529,7 @@ <h4 id=media-elements><span class=secno>4.7.10 </span>Media elements</h4>
 
   <p>Except where otherwise explicitly specified, the <a href=#task-source>task source</a> for all the tasks
   <a href=#queue-a-task title="queue a task">queued</a> in this section and its subsections is the <dfn id=media-element-event-task-source>media
-  element event task source</dfn>.</p>
+  element event task source</dfn> of the <a href=#media-element>media element</a> in question.</p>
 
   </div>
 
@@ -26388,14 +26388,17 @@ <h5 id=loading-the-media-resource><span class=secno>4.7.10.5 </span>Loading the
 
        <li>
 
+<!--CLEANUP-->
         <p>If either the <a href=#media-resource>media resource</a> or the address of the <var title="">current
-        media resource</var> indicate a particular set of audio or video tracks to enable, then the
+        media resource</var> indicate a particular set of audio or video tracks to enable,
+        or if the user agent has information that enabled it to select specific tracks for optimal performance, then the
         selected audio tracks must be enabled in the element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> object, and, of the selected video tracks,
         the one that is listed first in the element's <code title=dom-media-videoTracks><a href=#dom-media-videotracks>videoTracks</a></code> object must be selected. All other tracks
         must be disabled.</p>
 
-        <p class=example>Again, this could be done, for example, using the <cite>Media Fragments
-        URI</cite> fragment identifier syntax. <a href=#refsMEDIAFRAG>[MEDIAFRAG]</a></p>
+        <p class=example>This could again be triggered by <cite>Media Fragments URI</cite>
+        fragment identifier syntax, but it could also be triggered e.g. by the user agent selecting
+        a 5.1 surround sound audio track over a stereo audio track. <a href=#refsMEDIAFRAG>[MEDIAFRAG]</a></p>
 
        </li>
 

diff --git a/index b/index
@@ -298,7 +298,7 @@
 
   <header class=head id=head><p><a href=http://www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 12 March 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 13 March 2014</h2>
    </hgroup><dl><dt><strong>Web developer edition:</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -25529,7 +25529,7 @@ interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement
 
   <p>Except where otherwise explicitly specified, the <a href=#task-source>task source</a> for all the tasks
   <a href=#queue-a-task title="queue a task">queued</a> in this section and its subsections is the <dfn id=media-element-event-task-source>media
-  element event task source</dfn>.</p>
+  element event task source</dfn> of the <a href=#media-element>media element</a> in question.</p>
 
   </div>
 
@@ -26388,14 +26388,17 @@ interface <dfn id=htmlmediaelement>HTMLMediaElement</dfn> : <a href=#htmlelement
 
        <li>
 
+<!--CLEANUP-->
         <p>If either the <a href=#media-resource>media resource</a> or the address of the <var title="">current
-        media resource</var> indicate a particular set of audio or video tracks to enable, then the
+        media resource</var> indicate a particular set of audio or video tracks to enable,
+        or if the user agent has information that enabled it to select specific tracks for optimal performance, then the
         selected audio tracks must be enabled in the element's <code title=dom-media-audioTracks><a href=#dom-media-audiotracks>audioTracks</a></code> object, and, of the selected video tracks,
         the one that is listed first in the element's <code title=dom-media-videoTracks><a href=#dom-media-videotracks>videoTracks</a></code> object must be selected. All other tracks
         must be disabled.</p>
 
-        <p class=example>Again, this could be done, for example, using the <cite>Media Fragments
-        URI</cite> fragment identifier syntax. <a href=#refsMEDIAFRAG>[MEDIAFRAG]</a></p>
+        <p class=example>This could again be triggered by <cite>Media Fragments URI</cite>
+        fragment identifier syntax, but it could also be triggered e.g. by the user agent selecting
+        a 5.1 surround sound audio track over a stereo audio track. <a href=#refsMEDIAFRAG>[MEDIAFRAG]</a></p>
 
        </li>
 

diff --git a/source b/source
@@ -27007,7 +27007,7 @@ interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
 
   <p>Except where otherwise explicitly specified, the <span>task source</span> for all the tasks
   <span data-x="queue a task">queued</span> in this section and its subsections is the <dfn>media
-  element event task source</dfn>.</p>
+  element event task source</dfn> of the <span>media element</span> in question.</p>
 
   </div>
 
@@ -28030,16 +28030,20 @@ interface <dfn>HTMLMediaElement</dfn> : <span>HTMLElement</span> {
 
        <li>
 
+<!--CLEANUP-->
         <p>If either the <span>media resource</span> or the address of the <var data-x="">current
-        media resource</var> indicate a particular set of audio or video tracks to enable, then the
+        media resource</var> indicate a particular set of audio or video tracks to enable,
+        or if the user agent has information that enabled it to select specific tracks for optimal performance, then the
         selected audio tracks must be enabled in the element's <code
         data-x="dom-media-audioTracks">audioTracks</code> object, and, of the selected video tracks,
         the one that is listed first in the element's <code
         data-x="dom-media-videoTracks">videoTracks</code> object must be selected. All other tracks
         must be disabled.</p>
 
-        <p class="example">Again, this could be done, for example, using the <cite>Media Fragments
-        URI</cite> fragment identifier syntax. <a href="#refsMEDIAFRAG">[MEDIAFRAG]</a></p>
+        <p class="example">This could again be triggered by <cite>Media Fragments URI</cite>
+        fragment identifier syntax, but it could also be triggered e.g. by the user agent selecting
+        a 5.1 surround sound audio track over a stereo audio track. <a
+        href="#refsMEDIAFRAG">[MEDIAFRAG]</a></p>
 
        </li>