Changeset 807

Timestamp:

01/26/10 21:36:50 (3 years ago)

Author:

pablo

Message:

• Fixed some bugs in RTMP dynamic / load balanced streams
• Prevent fullscreen events from firing multiple resizes
• PlaylistItemLevels can include streamer

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (16 diffs)
• src/com/longtailvideo/jwplayer/model/PlaylistItem.as (modified) (5 diffs)
• src/com/longtailvideo/jwplayer/model/PlaylistItemLevel.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/utils/NetClient.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (2 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as

@@ -41 +41 @@
                 /** The currently playing RTMP stream. **/
                 private var _currentFile:String;
-                /** The currently active RTMP stream. **/
-                private var _currentStream:String;
         /** ID for the position interval. **/
         private var _positionInterval:Number;
-        /** Loader instance that loads the XML file. **/
-        private var _xmlLoader:AssetLoader;
+        /** Loaders for loading SMIL files. **/
+        private var _xmlLoaders:Dictionary;
         /** NetStream instance that handles the stream IO. **/
         private var _stream:NetStream;
@@ -79 +77 @@
             _connection.objectEncoding = ObjectEncoding.AMF0;
             _connection.client = new NetClient(this);
-            _xmlLoader = new AssetLoader();
-            _xmlLoader.addEventListener(Event.COMPLETE, loaderHandler);
-            _xmlLoader.addEventListener(ErrorEvent.ERROR, errorHandler);
+                        _xmlLoaders = new Dictionary();
             _transformer = new SoundTransform();
             _video = new Video(320, 240);
@@ -126 +122 @@
             Configger.saveCookie('bandwidth', bdw);
             if (item.levels.length > 0 && item.getLevel(config.bandwidth, config.width) != item.currentLevel) {
-                                item.setLevel(item.getLevel(config.bandwidth, config.width));
                 swap(item.currentLevel);
             }
@@ -152 +147 @@
             _position = 0;
                         _bufferFull = false;
-            if (item.levels.length > 0) {
-                loadLevelSync();
-            }
             _timeoffset = item.start;
+                        if (item.levels.length > 0) { item.setLevel(item.getLevel(config.bandwidth, config.width)); }
             clearInterval(_positionInterval);
                         setState(PlayerState.BUFFERING);
                         sendBufferEvent(0);
             if (getConfigProperty('loadbalance')) {
-                                if (!item.hasOwnProperty('smil')) { item.smil = []; }
-                                item.smilIndex = item.levels.length > 0 ? item.currentLevel : 0; 
-                item.smil[item.smilIndex] = item.file;
-                _xmlLoader.load(item.file, XML);
-            } else {
+                                loadSmil();
+                        } else {
                                 finishLoad();
-            }
-        }
-
+                        }
+        }
+
+                /** Load a SMIL file for load-balancing **/
+                private function loadSmil():void {
+                        if (!item.hasOwnProperty('smil')) { 
+                                item.smil = [];                         
+                                if (item.levels.length > 0) {
+                                        for (var i:Number = 0; i < item.levels.length; i++) {
+                                                item.smil[i] = (item.levels[i] as PlaylistItemLevel).file;
+                                        }
+                                } else {
+                                        item.smil[0] = item.file;
+                                }
+                        } 
+                        
+                        var smilFile:String = item.levels.length > 0 ? item.smil[item.currentLevel] : item.smil[0];
+                        
+                        var loader:AssetLoader = new AssetLoader();
+                        loader.addEventListener(Event.COMPLETE, loaderHandler);
+                        loader.addEventListener(ErrorEvent.ERROR, errorHandler);
+                        _xmlLoaders[loader] = smilFile;
+                        loader.load(smilFile, XML);
+                }
+                
                 /** Finalizes the loading process **/
                 private function finishLoad():void {
-                        var ext:String = item.file.substr(-4);
-                        if (ext == '.mp3'){
+                        if (item.file.substr(-4) == '.mp3') {
                                 media = null;
-                        } else {
+                        } else if (!media) {
                                 media = _video;
                         }
-                        if (item.streamer != _currentStream || !_isStreaming) {
-                                _currentStream = item.streamer;
-                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_LOADED);
-                                _connection.connect(item.streamer);
-                        } else {
-                                seek(_timeoffset);
-                        }
-                }
-                
-        /** Make sure the selected level is actually the item.file. **/
-        private function loadLevelSync():void {
-            for (var i:Number = 0; i < item.levels.length; i++) {
-                if (item.file == (item.levels[i] as PlaylistItemLevel).file) {
-                    item.setLevel(i);
-                    break;
-                }
-            }
-        }
-
+                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_LOADED);
+                        _connection.connect(item.streamer);
+                }
+                
         /** Get the streamer / file from the loadbalancing XML. **/
         private function loaderHandler(evt:Event):void {
             var xml:XML = XML((evt.target as AssetLoader).loadedObject);
-            item.streamer = xml.head.meta.@base.toString();
                         var fileLocation:String = xml.body.video.@src.toString();
+                        var smilLocation:String = _xmlLoaders[evt.target];
+                        delete _xmlLoaders[evt.target];
                         if (item.levels.length > 0) {
-                                (item.levels[item.smilIndex] as PlaylistItemLevel).file = fileLocation;
+                                var level:PlaylistItemLevel = item.levels[(item.smil as Array).indexOf(smilLocation)] as PlaylistItemLevel; 
+                                level.streamer = xml.head.meta.@base.toString();
+                                level.file = fileLocation;
                         } else {
-                item.file = fileLocation;
+                                item.streamer = xml.head.meta.@base.toString();
+                        item.file = fileLocation;
                         }
                         finishLoad();
@@ -239 +239 @@
                 setStream();
             }
-            if (dat.code == 'NetStream.Play.TransitionComplete'|| (dat.code == 'NetStream.Play.Transition' && dat.reason == 'NetStream.Transition.Success')) {
+            if (dat.code == 'NetStream.Play.TransitionComplete') {
                                 if (_transitionLevel >= 0) {
-                                        Logger.log("Transition to level " + item.currentLevel + "complete");
+                                        Logger.log("Transition to level " + item.currentLevel + " complete");
                         _transitionLevel = -1;
                                 }
@@ -256 +256 @@
                         
                         clearInterval(_positionInterval);
-                        setState(PlayerState.PAUSED);
+                        super.pause();
             if (_stream) { 
                                 Logger.log("NetStream.pause()");
@@ -265 +265 @@
         /** Resume playing. **/
         override public function play():void {
-            if (_stream) {
+                        clearInterval(_positionInterval);
+            if (state == PlayerState.PAUSED) {
                                 Logger.log("NetStream.resume()");
                                 _stream.resume();                               
                         }
-                        clearInterval(_positionInterval);
-            _positionInterval = setInterval(positionInterval, 100);
-                        setState(PlayerState.PLAYING);
+                        super.play();
+                        _positionInterval = setInterval(positionInterval, 100);
         }
 
@@ -307 +307 @@
                         if (state == PlayerState.PLAYING) {
                 if (item.levels.length > 0 && item.currentLevel != item.getLevel(config.bandwidth, config.width)) {
-                                        item.setLevel(item.getLevel(config.bandwidth, config.width));
                         if (_dynamic) {
-                            swap(item.currentLevel);
+                            swap(item.getLevel(config.bandwidth, config.width));
                         } else {
                             seek(position);
@@ -319 +318 @@
         /** Seek to a new position. **/
         override public function seek(pos:Number):void {
-            _timeoffset = pos;
+            super.seek(pos);
             _transitionLevel = -1;
+                        _timeoffset = pos;
             clearInterval(_positionInterval);
             clearInterval(_bandwidthInterval);
@@ -331 +331 @@
                 }
             }
-                        if (state != PlayerState.PLAYING) {
+                        if (state == PlayerState.PAUSED) {
                                 play();
                         }
@@ -343 +343 @@
                                         try {
                         _stream.play(getID(item.file));
-                                        } catch(e:Error) {}
+                                        } catch(e:Error) {
+                                                Logger.log("Error: " + e.message);
+                                        }
                 }
-                if (_timeoffset >= 0 || state == PlayerState.IDLE) {
+                if (_timeoffset > 0 || state == PlayerState.IDLE) {
                     if (_stream) {
                                                 Logger.log("NetStream.seek(" + _timeoffset + ")");
@@ -378 +380 @@
                 case 'NetConnection.Connect.Success':
                     if (evt.info.secureToken != undefined) {
-                        _connection.call("secureTokenResponse", null, TEA.decrypt(evt.info.secureToken,
-                                                                                 config.token));
+                        _connection.call("secureTokenResponse", null, TEA.decrypt(evt.info.secureToken,
+                                                                                  config.token));
                     }
                     if (evt.info.data) {
@@ -389 +391 @@
                     } else {
                         if (item.levels.length > 0) {
-                            if (_dynamic || _bandwidthInterval) {
+                            if (_dynamic || _bandwidthChecked) {
                                 setStream();
                             } else {
@@ -478 +480 @@
                                 /** Replace file values with original redirects **/
                                 if (item.levels.length > 0) {
-                                        for (var i:Number = 0; i < item.levels.length; i++) {
-                                                if (i < item.smil.length && item.smil[i]) {
-                                                        (item.levels[i] as PlaylistItemLevel).file = item.smil[i];
+                                        for each (var level:PlaylistItemLevel in item.levels) { 
+                                                for (var i:Number = 0; i < (item.smil as Array).length; i++) {
+                                                        level.file = item.smil[i];
                                                 }
                                         }
@@ -503 +505 @@
             } else {
                 _transitionLevel = newLevel;
-                Logger.log('transition to level ' + item.currentLevel + ' initiated');
+                                item.setLevel(newLevel);
+                Logger.log('transition to level ' + newLevel + ' initiated');
                 var nso:NetStreamPlayOptions = new NetStreamPlayOptions();
                 nso.streamName = getID(item.file);
@@ -519 +522 @@
                 _stream.soundTransform = _transformer;
             }
+                        
+                        super.setVolume(vol);
         }
                 

trunk/fl5/src/com/longtailvideo/jwplayer/model/PlaylistItem.as

@@ -15 +15 @@
                 public var mediaid:String               = "";
                 public var start:Number                 = 0;
-                public var streamer:String              = "";
                 public var tags:String                  = "";
                 public var title:String                 = "";
@@ -21 +20 @@
                 
                 protected var _file:String                      = "";
+                protected var _streamer:String          = "";
                 protected var _currentLevel:Number      = -1;
                 protected var _levels:Array                     = [];
@@ -32 +32 @@
                                         for each (var level:Object in levels) {
                                                 if (level['file'] && level['bitrate'] && level['width']) {
-                                                        addLevel(new PlaylistItemLevel(level['file'], level['bitrate'], level['width']));
+                                                        addLevel(new PlaylistItemLevel(level['file'], level['bitrate'], level['width'], level['streamer']));
                                                 }
                                         }
@@ -44 +44 @@
                 public function get file():String {
                         if (_levels.length > 0 && _currentLevel > -1 && _currentLevel < _levels.length) {
-                                return (_levels[_currentLevel] as PlaylistItemLevel).file;
+                                var level:PlaylistItemLevel = _levels[_currentLevel] as PlaylistItemLevel; 
+                                return level.file ? level.file : _file;
                         } else {
                                 return _file;
@@ -53 +54 @@
                 public function set file(f:String):void {
                         _file = f;
+                }
+                
+                /** Streamer property is now a getter, to take levels into account **/
+                public function get streamer():String {
+                        if (_levels.length > 0 && _currentLevel > -1 && _currentLevel < _levels.length) {
+                                var level:PlaylistItemLevel = _levels[_currentLevel] as PlaylistItemLevel; 
+                                return level.streamer ? level.streamer : _streamer;
+                        } else {
+                                return _streamer;
+                        }
+                }
+                
+                /** Streamer setter.  Note, if levels are defined, this will be ignored. **/
+                public function set streamer(s:String):void {
+                        _streamer = s;
                 }
                 

trunk/fl5/src/com/longtailvideo/jwplayer/model/PlaylistItemLevel.as

@@ -6 +6 @@
                 public var bitrate:Number       = 0;
                 public var width:Number         = 0;
+                public var streamer:String      = "";
                 
                 /**
@@ -12 +13 @@
                  * @param width - The width of the file
                  */
-                public function PlaylistItemLevel(file:String, bitrate:Number, width:Number) {
+                public function PlaylistItemLevel(file:String, bitrate:Number, width:Number, streamer:String="") {
                         this.file = file;
+                        this.streamer = streamer;
                         this.bitrate = bitrate;
                         this.width = width;

trunk/fl5/src/com/longtailvideo/jwplayer/player/PlayerVersion.as

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = "5.1.806";
+                protected static var _version:String = "5.1.807";
                 
                 public static function get version():String {

trunk/fl5/src/com/longtailvideo/jwplayer/utils/NetClient.as

@@ -95 +95 @@
                 
                 /** Receive NetStream playback codes. **/
-                public function onPlayStatus(dat:Object):void {
-                        if (dat.code == "NetStream.Play.Complete") {
-                                forward(dat, 'complete');
-                        } else {
-                                forward(dat, 'playstatus');
+                public function onPlayStatus(... rest):void {
+                        for each (var dat:Object in rest) {
+                                if (dat && dat.hasOwnProperty('code')) {
+                                        if (dat.code == "NetStream.Play.Complete") {
+                                                forward(dat, 'complete');
+                                        } else {
+                                                forward(dat, 'playstatus');
+                                        }
+                                }
                         }
                 }

trunk/fl5/src/com/longtailvideo/jwplayer/view/View.as

@@ -133 +133 @@
                         setupComponents();
 
-                        RootReference.stage.addEventListener(Event.FULLSCREEN, resizeHandler);
                         RootReference.stage.addEventListener(Event.RESIZE, resizeHandler);
 
@@ -244 +243 @@
 
                 protected function resizeHandler(event:Event):void {
-                        redraw();
-
                         var currentFSMode:Boolean = (RootReference.stage.displayState == StageDisplayState.FULL_SCREEN);
                         if (_model.fullscreen != currentFSMode) {
                                 dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_VIEW_FULLSCREEN, currentFSMode));
                         }
+
+                        redraw();
                 }