Changeset 1064


Ignore:
Timestamp:
05/22/10 15:14:50 (4 years ago)
Author:
jeroen
Message:

added WebM test and WebM format docs to HTML5 player

Location:
trunk/html5
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/html5/doc/api.rst

    r1051 r1064  
    1 .. api: 
     1.. _api: 
    22 
    33Player API 
  • trunk/html5/doc/formats.rst

    r1051 r1064  
    1919    Supported for Safari 4+ and as part of the the Flash fallback. 
    2020 
    21 .. describe:: Theora video / Vorbis audio in the OGG container 
     21.. describe:: Theora video / Vorbis audio in the Ogg container 
    2222 
    2323   Supported for Firefox 3.5+, Opera 10.5+, Chrome 4+ and as part of the the Flash fallback. 
     24 
     25.. describe:: VP8 video / Vorbis audio in the WebM (Matroska) container 
     26 
     27   Supported for Opera 10.54+; more browsers coming. 
    2428 
    2529.. describe:: VP6 video / MP3 audio in the FLV container 
     
    4549    AAC audio, in the MP4 container (example).  
    4650    Supported for Safari 4+, Chrome 3+, Internet Explorer 9+ and as part of the the Flash fallback. 
    47     Vorbis audio in the OGG container (example)  
     51    Vorbis audio in the Ogg container (example)  
    4852    Supported for Firefox 3.5+, Opera 10.5+ and Chrome 4+. 
    4953 
     
    6670   <video width="400" height="200" id="player"> 
    6771     <source src="/static/video.mp4" type="video/mp4; codecs='avc1.42E01E, mp4a.40.2'"> 
     72     <source src="/static/video.webm" type="video/webm; codecs='vp8, vorbis'"> 
    6873     <source src="/static/video.ogv" type="video/ogg; codecs='theora, vorbis'"> 
    6974   </video> 
     
    8792   Theora video and Vorbis audio. 
    8893 
     94.. describe:: vp8, vorbis 
     95 
     96   VP8 video and Vorbis audio. 
     97 
    8998Mimetypes 
    9099^^^^^^^^^ 
     
    96105   <video width="400" height="200" id="player"> 
    97106     <source src="/static/video.mp4" type="video/mp4"> 
     107     <source src="/static/video.webm" type="video/webm"> 
    98108     <source src="/static/video.ogv" type="video/ogg"> 
    99109   </video> 
     
    107117.. describe:: video/ogg 
    108118 
    109    OGG video. The player presumes Theora video and Vorbis audio. 
     119   Ogg video. The player presumes Theora video and Vorbis audio. 
     120 
     121.. describe:: video/webm 
     122 
     123   WebM video. The player presumes VP8 video and Vorbis audio. 
    110124 
    111125.. describe:: video/quicktime 
     
    134148.. describe:: .ogg, .ogv 
    135149 
    136    OGG video. The player presumes Theora video and Vorbis audio in an OGG container. 
     150   Ogg video. The player presumes Theora video and Vorbis audio in an Ogg container. 
     151 
     152.. describe: .webm 
     153 
     154   WebM video. The player presumes VP8 video and Vorbis audio in a WebM (Matroska) container. 
    137155 
    138156.. describe:: .mov 
  • trunk/html5/test/examples/mp4_ogg.html

    r1000 r1064  
    2020 
    2121<p>First, place this code in the <ems>&lt;head&gt;</ems> of your page:</p> 
    22 <pre>&lt;script type="text/javascript" src="/scripts/jwplayer.js"&gt;&lt;/script&gt; 
     22<pre>&lt;script type="text/javascript" src="/scripts/jquery.js"&gt;&lt;/script&gt; 
    2323&lt;script type="text/javascript" src="/scripts/jquery.jwplayer.js"&gt;&lt;/script&gt;</pre> 
    2424 
  • trunk/html5/test/index.html

    r1023 r1064  
    4444                                file:'http://content.bitsontherun.com/videos/nPripu9l-239131.flv', 
    4545                                flashplayer:'../assets/player.swf', 
     46                                skin:'five', 
     47                                height:240, 
     48                                width:500 
     49                        }, 
     50                        'WebM video': { 
     51                                file:'/player/testing/files/bunny.webm', 
    4652                                skin:'five', 
    4753                                height:240, 
     
    415421 
    416422<div id="preview"> 
    417         <video id="container" width="400" height="200"> 
     423        <video id="container" src="" poster="" width="400" height="200" controls></video> 
    418424</div> 
    419425 
Note: See TracChangeset for help on using the changeset viewer.