Changeset 1706

Timestamp:

04/06/11 04:05:35 (2 years ago)

Author:

jeroen

Message:

some incremental work on multilanguage captions - mostly structuring the app

Location:

branches/captions

Files:

• assets/buttonOver.png (added)
• assets/downOver.png (added)
• assets/upOver.png (added)
• captions.swf (modified) (previous)
• src/com/longtailvideo/plugins/captions/Captions.as (modified) (7 diffs)
• src/com/longtailvideo/plugins/captions/Parser.as (deleted)
• src/com/longtailvideo/plugins/captions/Renderer.as (deleted)
• src/com/longtailvideo/plugins/captions/Selector.as (deleted)
• src/com/longtailvideo/plugins/captions/SelectorButton.as (deleted)
• src/com/longtailvideo/plugins/captions/graphics (added)
• src/com/longtailvideo/plugins/captions/graphics/Renderer.as (added)
• src/com/longtailvideo/plugins/captions/graphics/Selector.as (added)
• src/com/longtailvideo/plugins/captions/graphics/SelectorButton.as (added)
• src/com/longtailvideo/plugins/captions/parsing (added)
• src/com/longtailvideo/plugins/captions/parsing/DFXP.as (added)
• src/com/longtailvideo/plugins/captions/parsing/ISO639.as (added)
• src/com/longtailvideo/plugins/captions/parsing/SRT.as (added)
• src/com/longtailvideo/plugins/captions/parsing/Usubs.as (added)
• test/index.html (modified) (1 diff)
• test/mp4.html (modified) (1 diff)
• test/usubs.html (added)

branches/captions/src/com/longtailvideo/plugins/captions/Captions.as

@@ -3 +3 @@
 
     import com.longtailvideo.jwplayer.events.MediaEvent;
+    import com.longtailvideo.jwplayer.events.PlaylistEvent;
     import com.longtailvideo.jwplayer.player.IPlayer;
     import com.longtailvideo.jwplayer.plugins.IPlugin;
@@ -8 +9 @@
     import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
     import com.longtailvideo.jwplayer.view.interfaces.IDockComponent;
+
+    import com.longtailvideo.plugins.captions.graphics.*;
+    import com.longtailvideo.plugins.captions.parsing.*;
 
     import flash.display.*;
@@ -41 +45 @@
         /** Reference to the captions renderer. **/
         private var _renderer:Renderer;
+        /** Currently active track. **/
+        private var _trackid:Number;
         /** Current listing of tracks. **/
         private var _tracks:Array;
@@ -54 +60 @@
             addChild(_selector);
             _cookie = SharedObject.getLocal('com.longtailvideo','/');
-            _tracks = new Array();
         };
 
@@ -75 +80 @@
             _player = player;
             _player.addEventListener(MediaEvent.JWPLAYER_MEDIA_TIME,_timeHandler);
+            _player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM,_itemHandler);
             _player.addEventListener(MediaEvent.JWPLAYER_MEDIA_META,_metaHandler);
             // Load the configuration options.
@@ -96 +102 @@
 
 
+        /** Check playlist item for captions. **/
+        private function _itemHandler(event:PlaylistEvent):void {
+            var item:Object = _player.playlist.currentItem;
+            _tracks = new Array();
+            if(item['captions.file']) {
+                // Load SRT or DFXP file.
+            } else if (item['captions.usubs']) {
+                // Do Usubs API calls.
+            } else {
+                // Listen to 3GPP TimedText metadata.
+            }
+        };
+
+
         /** Check for captions in metadata. **/
         private function _metaHandler(event:MediaEvent):void {
-            if(event.metadata.type == 'textdata') {
+            if(event.metadata.type == 'textdata' && event.metadata.id == _trackid) {
                 _renderer.setCaptions(event.metadata.text);
-            } else if (event.metadata.trackinfo) {
+            } else if (event.metadata.trackinfo && _tracks.length == 0) {
+                // Parse the text tracks.
                 for(var i:Number = 0; i<event.metadata.trackinfo.length; i++) {
                     var track:Object = event.metadata.trackinfo[i];
                     if(track.sampledescription[0].sampletype == 'tx3g') {
                         _tracks.push({
-                            label: Parser.LANGUAGES[track.language],
+                            label: ISO639.MAP[track.language],
                             trackid: i,
                             captions: undefined
@@ -111 +132 @@
                     }
                 }
-                if(_tracks.length > 0) { 
+                if(_tracks.length > 0) {
+                    _trackid = _tracks[0].trackid;
                     _selector.populate(_tracks);
                     resize(_player.config.width, _player.config.height);

branches/captions/test/index.html

@@ -17 +17 @@
 <ul>
     <li><a href="mp4.html">MP4 TimedText</a></li>
+    <li><a href="usubs.html">Universal Subtitles</a></li>
 </ul>
 

branches/captions/test/mp4.html

@@ -30 +30 @@
 
 <ul>
-    <li><a href="javascript:jwplayer().load('assets/bunny.mp4')">MP4 with single TextTrack</a></li>
-    <li><a href="javascript:jwplayer().load('assets/timoto.mp4')">MP4 with multiple TextTracks</a></li>
+    <li><a href="javascript:jwplayer().load('http://playertest.longtailvideo.com/bunny.mp4')">MP4 with single TextTrack</a></li>
+    <li><a href="javascript:jwplayer().load('http://playertest.longtailvideo.com/timoto.mp4')">MP4 with multiple TextTracks</a></li>
 </ul>