Skip to content

Commit

Permalink
[giow] (0) More DASH support for AudioTrack.kind and VideoTrack.kind.
Browse files Browse the repository at this point in the history 
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=12544
Affected topics: Video and Audio

git-svn-id: http://svn.whatwg.org/webapps@6983 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Feb 9, 2012
1 parent 56226ca commit d67973b
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 18 deletions.
22 changes: 16 additions & 6 deletions complete.html
View file
Expand Up @@ -30977,7 +30977,12 @@ <h6 id=audiotracklist-and-videotracklist-objects><span class=secno>4.8.10.10.1 <
<tbody><tr><td>"<dfn id=value-track-kind-alternate title=value-track-kind-alternate><code>alternative</code></dfn>"
<td>A possible alternative to the main track, e.g. a different take of a song (audio), or a different angle (video).
<td>Audio and video.
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate".
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate" without "main" and "commentary" roles, and, for audio, without the "dub" role (other roles ignored).

<tr><td>"<dfn id=value-track-kind-caption title=value-track-kind-caption><code>captions</code></dfn>"
<td>A version of the main video track with captions burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "caption" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-description title=value-track-kind-description><code>description</code></dfn>"
<td>An audio description of a video track.
Expand All @@ -30987,27 +30992,32 @@ <h6 id=audiotracklist-and-videotracklist-objects><span class=secno>4.8.10.10.1 <
<tr><td>"<dfn id=value-track-kind-main title=value-track-kind-main><code>main</code></dfn>"
<td>The primary audio or video track.
<td>Audio and video.
<td>Ogg: "audio/main" or "video/main"; WebM: the "FlagDefault" element is set; DASH: "main" role.
<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).

<tr><td>"<dfn id=value-track-kind-sign title=value-track-kind-sign><code>sign</code></dfn>"
<td>A sign-language interpretation of an audio track.
<td>Video only.
<td>Ogg: "video/sign".

<tr><td>"<dfn id=value-track-kind-subtitle title=value-track-kind-subtitle><code>subtitles</code></dfn>"
<td>A version of the main video track with subtitles burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "subtitle" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-translation title=value-track-kind-translation><code>translation</code></dfn>"
<td>A translated version of the main track.
<td>A translated version of the main audio track.
<td>Audio only.
<td>Ogg: "audio/dub". DASH: "dub" role.
<td>Ogg: "audio/dub". DASH: "dub" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-commentary title=value-track-kind-commentary><code>commentary</code></dfn>"
<td>Commentary on the primary audio or video track, e.g. a director's commentary.
<td>Audio and video.
<td>DASH: "commentary" role.
<td>DASH: "commentary" role without "main" role (other roles ignored).

<tr><td>"<dfn id=value-track-kind-none title=value-track-kind-none><code></code></dfn>" (empty string)
<td>No explicit kind, or the kind given by the track's metadata is not recognised by the user agent.
<td>Audio and video.
<td>Any other track type or track role.
<td>Any other track type, track role, or combination of track roles not described above.

</table><div class=impl>

Expand Down
22 changes: 16 additions & 6 deletions index
View file
Expand Up @@ -30977,7 +30977,12 @@ interface <dfn id=videotrack>VideoTrack</dfn> {
<tbody><tr><td>"<dfn id=value-track-kind-alternate title=value-track-kind-alternate><code>alternative</code></dfn>"
<td>A possible alternative to the main track, e.g. a different take of a song (audio), or a different angle (video).
<td>Audio and video.
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate".
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate" without "main" and "commentary" roles, and, for audio, without the "dub" role (other roles ignored).

<tr><td>"<dfn id=value-track-kind-caption title=value-track-kind-caption><code>captions</code></dfn>"
<td>A version of the main video track with captions burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "caption" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-description title=value-track-kind-description><code>description</code></dfn>"
<td>An audio description of a video track.
Expand All @@ -30987,27 +30992,32 @@ interface <dfn id=videotrack>VideoTrack</dfn> {
<tr><td>"<dfn id=value-track-kind-main title=value-track-kind-main><code>main</code></dfn>"
<td>The primary audio or video track.
<td>Audio and video.
<td>Ogg: "audio/main" or "video/main"; WebM: the "FlagDefault" element is set; DASH: "main" role.
<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).

<tr><td>"<dfn id=value-track-kind-sign title=value-track-kind-sign><code>sign</code></dfn>"
<td>A sign-language interpretation of an audio track.
<td>Video only.
<td>Ogg: "video/sign".

<tr><td>"<dfn id=value-track-kind-subtitle title=value-track-kind-subtitle><code>subtitles</code></dfn>"
<td>A version of the main video track with subtitles burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "subtitle" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-translation title=value-track-kind-translation><code>translation</code></dfn>"
<td>A translated version of the main track.
<td>A translated version of the main audio track.
<td>Audio only.
<td>Ogg: "audio/dub". DASH: "dub" role.
<td>Ogg: "audio/dub". DASH: "dub" and "main" roles together (other roles ignored).

<tr><td>"<dfn id=value-track-kind-commentary title=value-track-kind-commentary><code>commentary</code></dfn>"
<td>Commentary on the primary audio or video track, e.g. a director's commentary.
<td>Audio and video.
<td>DASH: "commentary" role.
<td>DASH: "commentary" role without "main" role (other roles ignored).

<tr><td>"<dfn id=value-track-kind-none title=value-track-kind-none><code></code></dfn>" (empty string)
<td>No explicit kind, or the kind given by the track's metadata is not recognised by the user agent.
<td>Audio and video.
<td>Any other track type or track role.
<td>Any other track type, track role, or combination of track roles not described above.

</table><div class=impl>

Expand Down
24 changes: 18 additions & 6 deletions source
View file
Expand Up @@ -33784,7 +33784,13 @@ interface <dfn>VideoTrack</dfn> {
<td>"<dfn title="value-track-kind-alternate"><code>alternative</code></dfn>"
<td>A possible alternative to the main track, e.g. a different take of a song (audio), or a different angle (video).
<td>Audio and video.
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate".
<td>Ogg: "audio/alternate" or "video/alternate"; DASH: "alternate" without "main" and "commentary" roles, and, for audio, without the "dub" role (other roles ignored).

<tr>
<td>"<dfn title="value-track-kind-caption"><code>captions</code></dfn>"
<td>A version of the main video track with captions burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "caption" and "main" roles together (other roles ignored).

<tr>
<td>"<dfn title="value-track-kind-description"><code>description</code></dfn>"
Expand All @@ -33796,31 +33802,37 @@ interface <dfn>VideoTrack</dfn> {
<td>"<dfn title="value-track-kind-main"><code>main</code></dfn>"
<td>The primary audio or video track.
<td>Audio and video.
<td>Ogg: "audio/main" or "video/main"; WebM: the "FlagDefault" element is set; DASH: "main" role.
<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).

<tr>
<td>"<dfn title="value-track-kind-sign"><code>sign</code></dfn>"
<td>A sign-language interpretation of an audio track.
<td>Video only.
<td>Ogg: "video/sign".

<tr>
<td>"<dfn title="value-track-kind-subtitle"><code>subtitles</code></dfn>"
<td>A version of the main video track with subtitles burnt in. (For legacy content; new content would use text tracks.)
<td>Video only.
<td>DASH: "subtitle" and "main" roles together (other roles ignored).

<tr>
<td>"<dfn title="value-track-kind-translation"><code>translation</code></dfn>"
<td>A translated version of the main track.
<td>A translated version of the main audio track.
<td>Audio only.
<td>Ogg: "audio/dub". DASH: "dub" role.
<td>Ogg: "audio/dub". DASH: "dub" and "main" roles together (other roles ignored).

<tr>
<td>"<dfn title="value-track-kind-commentary"><code>commentary</code></dfn>"
<td>Commentary on the primary audio or video track, e.g. a director's commentary.
<td>Audio and video.
<td>DASH: "commentary" role.
<td>DASH: "commentary" role without "main" role (other roles ignored).

<tr>
<td>"<dfn title="value-track-kind-none"><code></code></dfn>" (empty string)
<td>No explicit kind, or the kind given by the track's metadata is not recognised by the user agent.
<td>Audio and video.
<td>Any other track type or track role.
<td>Any other track type, track role, or combination of track roles not described above.

</table>

Expand Down

0 comments on commit d67973b

Please sign in to comment.