Changeset 810

Timestamp:

01/27/10 17:36:32 (3 years ago)

Author:

pablo

Message:

• Bitrate switching for HTTP Streams

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/HTTPMediaProvider.as (modified) (8 diffs)
• src/com/longtailvideo/jwplayer/media/MediaProvider.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (4 diffs)
• src/com/longtailvideo/jwplayer/media/VideoMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)

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

@@ -25 +25 @@
                 protected var _transformer:SoundTransform;
                 /** ID for the _position interval. **/
-                protected var _positionInterval:Number;
+                protected var _positionInterval:uint;
                 /** Save whether metadata has already been sent. **/
                 protected var _meta:Boolean;
@@ -36 +36 @@
                 /** Boolean for mp4 / flv streaming. **/
                 protected var _mp4:Boolean;
-                /** Load offset for bandwidth checking. **/
-                protected var _loadtimer:Number;
                 /** Variable that takes reloading into account. **/
                 protected var _iterator:Number;
@@ -46 +44 @@
                 /** Whether the enitre video has been buffered **/
                 private var _bufferingComplete:Boolean;
+                /** Whether we have checked the bandwidth. **/
+                private var _bandwidthSwitch:Boolean = true;
+                /** Whether we have checked bandwidth **/
+                private var _bandwidthChecked:Boolean;
+                /** Bandwidth check delay **/
+                private var _bandwidthTimeout:Number = 2000;
                 
                 /** Constructor; sets up the connection and display. **/
@@ -152 +156 @@
                         _bufferFull = false;
                         _bufferingComplete = false;
+                        _bandwidthChecked = false;
+                        _bandwidthSwitch = true;
+                        
+                        if (item.levels.length > 0) { item.setLevel(item.getLevel(config.bandwidth, config.width)); }
+                        
                         if (_stream.bytesLoaded + _byteoffset < _stream.bytesTotal) {
                                 _stream.close();
@@ -157 +166 @@
                         media = _video;
                         _stream.play(getURL());
-
-                        if (!_positionInterval) {
-                                _positionInterval = setInterval(positionInterval, 100);
-                        }
-                        if (!_loadtimer) {
-                                _loadtimer = setTimeout(loadTimeout, 3000);
-                        }
+                        
+                        clearInterval(_positionInterval);
+                        _positionInterval = setInterval(positionInterval, 100);
+                        
                         setState(PlayerState.BUFFERING);
                         sendBufferEvent(0, 0);
@@ -171 +177 @@
 
 
-                /** timeout for checking the bitrate. **/
-                protected function loadTimeout():void {
-                        var obj:Object = new Object();
-                        obj.bandwidth = Math.round(_stream.bytesLoaded / 1024 / 3 * 8);
-                        if (item.duration) {
-                                obj.bitrate = Math.round(_stream.bytesTotal / 1024 * 8 / item.duration);
-                        }
-                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: obj});
-                }
-
+                /** Bandwidth is checked as long the stream hasn't completed loading. **/
+                private function checkBandwidth(lastLoaded:Number):void {
+                        var currentLoaded:Number = _stream.bytesLoaded;
+                        var bandwidth:Number = Math.ceil((currentLoaded - lastLoaded) / 1024) * 8 / (_bandwidthTimeout / 1000);
+
+                        if (currentLoaded < _stream.bytesTotal) {
+                                if (bandwidth > 0) {
+                                        config.bandwidth = bandwidth;
+                                        var obj:Object = {bandwidth:bandwidth};
+                                        if (item.duration > 0) {
+                                                obj.bitrate = Math.ceil(_stream.bytesTotal / 1024 * 8 / item.duration);
+                                        }
+                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: obj});
+                                }
+                                if (_bandwidthSwitch) {
+                                        _bandwidthSwitch = false;
+                                        if (item.currentLevel != item.getLevel(config.bandwidth, config.width)) {
+                                                load(item);
+                                                return;
+                                        }
+                                }
+                                setTimeout(checkBandwidth, _bandwidthTimeout, currentLoaded);
+                        }
+                }
 
                 /** Get metadata information from netstream class. **/
@@ -246 +266 @@
                                 bufferFill = _stream.bufferLength/_stream.bufferTime * 100;
                         }
-
+        
+                        if (!_bandwidthChecked && _stream.bytesLoaded > 0 && _stream.bytesLoaded < _stream.bytesTotal) {
+                                _bandwidthChecked = true;
+                                setTimeout(checkBandwidth, _bandwidthTimeout, _stream.bytesLoaded);
+                        }
+                        
                         if (bufferFill < 25 && state == PlayerState.PLAYING) {
                                 _bufferFull = false;
@@ -344 +369 @@
                         super.setVolume(vol);
                 }
+
+                /** Handle a resize event **/
+                override public function resize(width:Number, height:Number):void {
+                        super.resize(width, height);
+                        if (item.levels.length > 0 && item.getLevel(config.bandwidth, config.width) != item.currentLevel) {
+                                _byteoffset = getOffset(position);
+                                _timeoffset = _position = getOffset(position,true);
+                                load(item);
+                        }
+                }
         }
 }

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

@@ -320 +320 @@
                         if (m) {
                                 _media = new MovieClip();
-                                //_media.visible = false;
+                                _media.visible = false;
                                 _media.addChild(m);
                                 if (_width * _height > 0) {

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

@@ -31 +31 @@
      **/
     public class RTMPMediaProvider extends MediaProvider {
-        /** Save if the bandwidth checkin already occurs. **/
-        private var _bandwidthChecked:Boolean;
+                /** Save if the bandwidth checkin already occurs. **/
+                private var _bandwidthChecked:Boolean;
         /** Interval for bw checking - with dynamic streaming. **/
         private var _bandwidthInterval:Number;
+                /** Whether to connect to a stream when bandwidth is detected. **/
+                private var _bandwidthSwitch:Boolean;
         /** NetConnection object for setup of the video stream. **/
         private var _connection:NetConnection;
@@ -147 +149 @@
             _position = 0;
                         _bufferFull = false;
+                        _bandwidthSwitch = false;                       
             _timeoffset = item.start;
                         if (item.levels.length > 0) { item.setLevel(item.getLevel(config.bandwidth, config.width)); }
@@ -237 +240 @@
                 config.bandwidth = dat.bandwidth;
                 Configger.saveCookie('bandwidth', dat.bandwidth);
-                setStream();
+                                if (_bandwidthSwitch) {
+                                        _bandwidthSwitch = false;
+                        setStream();
+                                }
             }
             if (dat.code == 'NetStream.Play.TransitionComplete') {
@@ -395 +401 @@
                             } else {
                                                                 _bandwidthChecked = true;
+                                                                _bandwidthSwitch = true;
                                 _connection.call('checkBandwidth', null);
                             }

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

@@ -176 +176 @@
                 private function checkBandwidth(lastLoaded:Number):void {
                         var currentLoaded:Number = _stream.bytesLoaded;
-                        var bandwidth:Number = ((currentLoaded - lastLoaded) / 1024) * 8 / (_bandwidthTimeout / 1000);
+                        var bandwidth:Number = Math.ceil((currentLoaded - lastLoaded) / 1024) * 8 / (_bandwidthTimeout / 1000);
                         if (currentLoaded < _stream.bytesTotal) {
                                 if (bandwidth > 0) {
@@ -182 +182 @@
                                         var obj:Object = {bandwidth:bandwidth};
                                         if (item.duration > 0) {
-                                                obj.bitrate = Math.round(_stream.bytesTotal / 1024 * 8 / item.duration);
+                                                obj.bitrate = Math.ceil(_stream.bytesTotal / 1024 * 8 / item.duration);
                                         }
                                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: obj});

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

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