Changeset 1064

Timestamp:

05/22/10 15:14:50 (3 years ago)

Author:

jeroen

Message:

added WebM test and WebM format docs to HTML5 player

Location:

trunk/html5

Files:

• doc/api.rst (modified) (1 diff)
• doc/formats.rst (modified) (7 diffs)
• test/examples/mp4_ogg.html (modified) (1 diff)
• test/index.html (modified) (2 diffs)

trunk/html5/doc/api.rst

@@ -1 @@
-.. api:
+.. _api:
 
 Player API

trunk/html5/doc/formats.rst

@@ -19 +19 @@
     Supported for Safari 4+ and as part of the the Flash fallback.
 
-.. describe:: Theora video / Vorbis audio in the OGG container
+.. describe:: Theora video / Vorbis audio in the Ogg container
 
    Supported for Firefox 3.5+, Opera 10.5+, Chrome 4+ and as part of the the Flash fallback.
+
+.. describe:: VP8 video / Vorbis audio in the WebM (Matroska) container
+
+   Supported for Opera 10.54+; more browsers coming.
 
 .. describe:: VP6 video / MP3 audio in the FLV container
@@ -45 +49 @@
     AAC audio, in the MP4 container (example). 
     Supported for Safari 4+, Chrome 3+, Internet Explorer 9+ and as part of the the Flash fallback.
-    Vorbis audio in the OGG container (example) 
+    Vorbis audio in the Ogg container (example) 
     Supported for Firefox 3.5+, Opera 10.5+ and Chrome 4+.
 
@@ -66 +70 @@
    <video width="400" height="200" id="player">
      <source src="/static/video.mp4" type="video/mp4; codecs='avc1.42E01E, mp4a.40.2'">
+     <source src="/static/video.webm" type="video/webm; codecs='vp8, vorbis'">
      <source src="/static/video.ogv" type="video/ogg; codecs='theora, vorbis'">
    </video>
@@ -87 +92 @@
    Theora video and Vorbis audio.
 
+.. describe:: vp8, vorbis
+
+   VP8 video and Vorbis audio.
+
 Mimetypes
 ^^^^^^^^^
@@ -96 +105 @@
    <video width="400" height="200" id="player">
      <source src="/static/video.mp4" type="video/mp4">
+     <source src="/static/video.webm" type="video/webm">
      <source src="/static/video.ogv" type="video/ogg">
    </video>
@@ -107 +117 @@
 .. describe:: video/ogg
 
-   OGG video. The player presumes Theora video and Vorbis audio.
+   Ogg video. The player presumes Theora video and Vorbis audio.
+
+.. describe:: video/webm
+
+   WebM video. The player presumes VP8 video and Vorbis audio.
 
 .. describe:: video/quicktime
@@ -134 +148 @@
 .. describe:: .ogg, .ogv
 
-   OGG video. The player presumes Theora video and Vorbis audio in an OGG container.
+   Ogg video. The player presumes Theora video and Vorbis audio in an Ogg container.
+
+.. describe: .webm
+
+   WebM video. The player presumes VP8 video and Vorbis audio in a WebM (Matroska) container.
 
 .. describe:: .mov

trunk/html5/test/examples/mp4_ogg.html

@@ -20 +20 @@
 
 <p>First, place this code in the <ems>&lt;head&gt;</ems> of your page:</p>
-<pre>&lt;script type="text/javascript" src="/scripts/jwplayer.js"&gt;&lt;/script&gt;
+<pre>&lt;script type="text/javascript" src="/scripts/jquery.js"&gt;&lt;/script&gt;
 &lt;script type="text/javascript" src="/scripts/jquery.jwplayer.js"&gt;&lt;/script&gt;</pre>
 

trunk/html5/test/index.html

@@ -44 +44 @@
                                 file:'http://content.bitsontherun.com/videos/nPripu9l-239131.flv',
                                 flashplayer:'../assets/player.swf',
+                                skin:'five',
+                                height:240,
+                                width:500
+                        },
+                        'WebM video': {
+                                file:'/player/testing/files/bunny.webm',
                                 skin:'five',
                                 height:240,
@@ -415 +421 @@
 
 <div id="preview">
-        <video id="container" width="400" height="200">
+        <video id="container" src="" poster="" width="400" height="200" controls></video>
 </div>