- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 06 Oct 2012 10:14:26 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv28415
Modified Files:
media-elements.html single-page.html spec.html
Log Message:
commit 13dcd8fd8f76ee72fc1ab1434da230508e2c2c9a
Merge: 7acaf3a eff5d38
Author: Silvia Pfeiffer <silviapfeiffer1@gmail.com>
Date: Sat Oct 6 20:10:42 2012 +1000
Merge branch 'feature/whatwg_tracks'
Index: media-elements.html
===================================================================
RCS file: /sources/public/html5/spec/media-elements.html,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- media-elements.html 6 Oct 2012 00:51:44 -0000 1.195
+++ media-elements.html 6 Oct 2012 10:14:23 -0000 1.196
@@ -3634,6 +3634,11 @@
</td><td>Audio and video.
</td><td>Ogg: "audio/main" or "video/main"; WebM: the "FlagDefault" element is set; DASH: "main" role without "caption", "subtitle", and "dub" roles (other roles ignored).
+ </td></tr><tr><td>"<dfn id="value-track-kind-main-desc" title="value-track-kind-main-desc"><code>main-desc</code></dfn>"
+ </td><td>The primary audio track, mixed with audio descriptions.
+ </td><td>Audio only.
+ </td><td>AC3 audio in MPEG-2 TS: bsmod=2 and full_svc=1. <!-- see https://www.w3.org/Bugs/Public/show_bug.cgi?id=17797#c1 -->
+
</td></tr><tr><td>"<dfn id="value-track-kind-sign" title="value-track-kind-sign"><code>sign</code></dfn>"
</td><td>A sign-language interpretation of an audio track.
</td><td>Video only.
@@ -5480,7 +5485,14 @@
<li><p><a href="#perform-automatic-text-track-selection">Perform automatic text track selection</a> for <code title="dom-TextTrack-kind-chapters"><a href="#dom-texttrack-kind-chapters">chapters</a></code>.</p></li>
- <li><p><a href="#perform-automatic-text-track-selection">Perform automatic text track selection</a> for <code title="dom-TextTrack-kind-metadata"><a href="#dom-texttrack-kind-metadata">metadata</a></code>.</p></li>
+ <li><p>If there are any <a href="#text-track" title="text track">text tracks</a>
+ in the <a href="#media-element">media element</a>'s <a href="#list-of-text-tracks">list of text
+ tracks</a> whose <a href="#text-track-kind">text track kind</a> is <code title="dom-TextTrack-kind-metadata"><a href="#dom-texttrack-kind-metadata">metadata</a></code> that correspond
+ to <code><a href="the-track-element.html#the-track-element">track</a></code> elements with a <code title="attr-track-default"><a href="the-track-element.html#attr-track-default">default</a></code> attribute set whose
+ <a href="#text-track-mode">text track mode</a> is set to <a href="#text-track-disabled" title="text track
+ disabled">disabled</a>, then set the <a href="#text-track-mode">text track
+ mode</a> of all such tracks to <a href="#text-track-hidden" title="text track
+ hidden">hidden</a></p></li>
<li><p>Set the element's
<a href="#did-perform-automatic-track-selection">did-perform-automatic-track-selection</a> flag to
@@ -5494,7 +5506,8 @@
the <a href="#text-track" title="text track">text tracks</a> in the <a href="#media-element">media
element</a>'s <a href="#list-of-text-tracks">list of text tracks</a> whose <a href="#text-track-kind">text
track kind</a> is one of the kinds that were passed to the
- algorithm, if any.</p></li>
+ algorithm, if any, in the order given in the <a href="#list-of-text-tracks">list of text
+ tracks</a>.</p></li>
<li><p>If <var title="">candidates</var> is empty, then abort these
steps.</p></li>
@@ -5516,11 +5529,11 @@
<code><a href="the-track-element.html#the-track-element">track</a></code> elements with a <code title="attr-track-default"><a href="the-track-element.html#attr-track-default">default</a></code> attribute set whose
<a href="#text-track-mode">text track mode</a> is set to <a href="#text-track-disabled" title="text track
disabled">disabled</a>, then additionally set the <a href="#text-track-mode">text
- track mode</a> of each such track to <a href="#text-track-hidden" title="text track
- hidden">hidden</a>.</p> <!-- so that we still get events and
- stuff: we can expect authors to forget that default doesn't mean
- that it'll always be turned on, and that they'll still rely on
- events firing even if it doesn't show -->
+ track mode</a> of the first such track to <a href="#text-track-hidden" title="text
+ track hidden">hidden</a>.</p> <!-- so that we still get events
+ and stuff: we can expect authors to forget that default doesn't
+ mean that it'll always be turned on, and that they'll still rely
+ on events firing even if it doesn't show -->
<p class="note">For example, the user could have set a browser
preference to the effect of "I want French captions whenever
@@ -5534,7 +5547,7 @@
<code><a href="the-track-element.html#the-track-element">track</a></code> elements with a <code title="attr-track-default"><a href="the-track-element.html#attr-track-default">default</a></code> attribute set whose
<a href="#text-track-mode">text track mode</a> is set to <a href="#text-track-disabled" title="text track
disabled">disabled</a>, then set the <a href="#text-track-mode">text track
- mode</a> of each such track to <a href="#text-track-showing" title="text track
+ mode</a> of the first such track to <a href="#text-track-showing" title="text track
showing">showing</a>.</p>
</li>
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- single-page.html 6 Oct 2012 00:51:50 -0000 1.146
+++ single-page.html 6 Oct 2012 10:14:23 -0000 1.147
@@ -31106,6 +31106,11 @@
</td><td>Audio and video.
</td><td>Ogg: "audio/main" or "video/main"; WebM: the "FlagDefault" element is set; DASH: "main" role without "caption", "subtitle", and "dub" roles (other roles ignored).
+ </td></tr><tr><td>"<dfn id=value-track-kind-main-desc title=value-track-kind-main-desc><code>main-desc</code></dfn>"
+ </td><td>The primary audio track, mixed with audio descriptions.
+ </td><td>Audio only.
+ </td><td>AC3 audio in MPEG-2 TS: bsmod=2 and full_svc=1. <!-- see https://www.w3.org/Bugs/Public/show_bug.cgi?id=17797#c1 -->
+
</td></tr><tr><td>"<dfn id=value-track-kind-sign title=value-track-kind-sign><code>sign</code></dfn>"
</td><td>A sign-language interpretation of an audio track.
</td><td>Video only.
@@ -32952,7 +32957,14 @@
<li><p><a href=#perform-automatic-text-track-selection>Perform automatic text track selection</a> for <code title=dom-TextTrack-kind-chapters><a href=#dom-texttrack-kind-chapters>chapters</a></code>.</p></li>
- <li><p><a href=#perform-automatic-text-track-selection>Perform automatic text track selection</a> for <code title=dom-TextTrack-kind-metadata><a href=#dom-texttrack-kind-metadata>metadata</a></code>.</p></li>
+ <li><p>If there are any <a href=#text-track title="text track">text tracks</a>
+ in the <a href=#media-element>media element</a>'s <a href=#list-of-text-tracks>list of text
+ tracks</a> whose <a href=#text-track-kind>text track kind</a> is <code title=dom-TextTrack-kind-metadata><a href=#dom-texttrack-kind-metadata>metadata</a></code> that correspond
+ to <code><a href=#the-track-element>track</a></code> elements with a <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute set whose
+ <a href=#text-track-mode>text track mode</a> is set to <a href=#text-track-disabled title="text track
+ disabled">disabled</a>, then set the <a href=#text-track-mode>text track
+ mode</a> of all such tracks to <a href=#text-track-hidden title="text track
+ hidden">hidden</a></p></li>
<li><p>Set the element's
<a href=#did-perform-automatic-track-selection>did-perform-automatic-track-selection</a> flag to
@@ -32966,7 +32978,8 @@
the <a href=#text-track title="text track">text tracks</a> in the <a href=#media-element>media
element</a>'s <a href=#list-of-text-tracks>list of text tracks</a> whose <a href=#text-track-kind>text
track kind</a> is one of the kinds that were passed to the
- algorithm, if any.</p></li>
+ algorithm, if any, in the order given in the <a href=#list-of-text-tracks>list of text
+ tracks</a>.</p></li>
<li><p>If <var title="">candidates</var> is empty, then abort these
steps.</p></li>
@@ -32988,11 +33001,11 @@
<code><a href=#the-track-element>track</a></code> elements with a <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute set whose
<a href=#text-track-mode>text track mode</a> is set to <a href=#text-track-disabled title="text track
disabled">disabled</a>, then additionally set the <a href=#text-track-mode>text
- track mode</a> of each such track to <a href=#text-track-hidden title="text track
- hidden">hidden</a>.</p> <!-- so that we still get events and
- stuff: we can expect authors to forget that default doesn't mean
- that it'll always be turned on, and that they'll still rely on
- events firing even if it doesn't show -->
+ track mode</a> of the first such track to <a href=#text-track-hidden title="text
+ track hidden">hidden</a>.</p> <!-- so that we still get events
+ and stuff: we can expect authors to forget that default doesn't
+ mean that it'll always be turned on, and that they'll still rely
+ on events firing even if it doesn't show -->
<p class=note>For example, the user could have set a browser
preference to the effect of "I want French captions whenever
@@ -33006,7 +33019,7 @@
<code><a href=#the-track-element>track</a></code> elements with a <code title=attr-track-default><a href=#attr-track-default>default</a></code> attribute set whose
<a href=#text-track-mode>text track mode</a> is set to <a href=#text-track-disabled title="text track
disabled">disabled</a>, then set the <a href=#text-track-mode>text track
- mode</a> of each such track to <a href=#text-track-showing title="text track
+ mode</a> of the first such track to <a href=#text-track-showing title="text track
showing">showing</a>.</p>
</li>
Received on Saturday, 6 October 2012 10:14:28 UTC