Changeset 747

Timestamp:

12/11/09 14:59:21 (3 years ago)

Author:

zach

Message:

• Updating buffer_full event dispatching for HTTPMediaProvider
• Adding suppressing duplicate buffer_full events in RTMP
• Adding livestream capability to RTMP ( http://developer.longtailvideo.com/trac/ticket/648). Note: Livestreams should only call _stream.resume once.

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/HTTPMediaProvider.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (13 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)

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

@@ -231 +231 @@
                         var bufferPercent:Number;
                         var bufferFill:Number;
-                        if (item.duration >= 0) {
+                        if (item.duration > 0) {
                                 bufferPercent = (_stream.bytesLoaded / _stream.bytesTotal) * (1 - _timeoffset / item.duration) * 100;
                                 var bufferTime:Number = _stream.bufferTime < (item.duration - position) ? _stream.bufferTime : Math.round(item.duration - position);
@@ -242 +242 @@
                         if (bufferFill < 25 && state == PlayerState.PLAYING) {
                                 _stream.pause();
+                                _bufferFull = false;
                                 setState(PlayerState.BUFFERING);
-                                _bufferFull = false;
                         } else if (bufferFill > 95 && state == PlayerState.BUFFERING && _bufferFull == false) {
                                 sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
@@ -301 +301 @@
                                         error('Video not found: ' + item.file);
                                         break;
+                                case 'NetStream.Buffer.Full':
+                                        if (!_bufferFull) {
+                                                _bufferFull = true;
+                                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
+                                        }
+                                        break;
                         }
                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: {status: evt.info.code}});

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

@@ -14 +14 @@
         import com.longtailvideo.jwplayer.utils.NetClient;
         import com.longtailvideo.jwplayer.utils.TEA;
-
+        
         import flash.events.*;
         import flash.media.*;
@@ -40 +40 @@
                 /** Save that a file is _unpublished. **/
                 protected var _unpublished:Boolean;
-
+                /** Whether the buffer has filled **/
+                private var _bufferFull:Boolean;
 
                 public function RTMPMediaProvider() {
@@ -92 +93 @@
                         _item = itm;
                         _position = 0;
+                        _bufferFull = false;
                         setState(PlayerState.BUFFERING);
                         sendBufferEvent(0);
@@ -143 +145 @@
                 }
 
+                
+                /** Determines if the stream is a live stream **/
+                private function get livestream():Boolean {
+                        return item.duration == 0;
+                }
 
                 /** Pause playback. **/
@@ -148 +155 @@
                         _stream.pause();
                         clearInterval(_positionInterval);
+                        _positionInterval = undefined;
                         super.pause();
                         if (_started && item.duration == 0) {
@@ -157 +165 @@
                 /** Resume playing. **/
                 override public function play():void {
-                        _stream.resume();
-                        _positionInterval = setInterval(positionInterval, 100);
+                        if (!(livestream && _started)) {
+                                _stream.resume();
+                        }
+                        if (!_positionInterval) {
+                                _positionInterval = setInterval(positionInterval, 100);
+                        }
                         super.play();
                 }
@@ -166 +178 @@
                 protected function positionInterval():void {
                         _position = Math.round(_stream.time * 10) / 10;
-                        var bufferTime:Number = _stream.bufferTime < (item.duration - position) ? _stream.bufferTime : (item.duration - position);
-                        var bfr:Number = Math.round(_stream.bufferLength / bufferTime * 100);
+
+                        var bfr:Number;
+                        if (!livestream) {
+                                var bufferTime:Number = _stream.bufferTime < (item.duration - position) ? _stream.bufferTime : (item.duration - position);
+                                bfr = Math.round(_stream.bufferLength / bufferTime * 100);
+                        } else {
+                                bfr = Math.round(_stream.bufferLength / _stream.bufferTime * 100);
+                        }
+                        
                         if (bfr < 95 && position < Math.abs(item.duration - _stream.bufferTime - 1)) {
                                 if (state == PlayerState.PLAYING && bfr < 20) {
                                         _stream.pause();
+                                        _bufferFull = false;
                                         setState(PlayerState.BUFFERING);
                                         _stream.bufferTime = config.bufferlength;
@@ -176 +196 @@
                                 }
                         } else if (bfr > 95 && state == PlayerState.BUFFERING) {
-                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
                                 _stream.bufferTime = config.bufferlength * 4;
                                 sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: {bufferlength: config.bufferlength * 4}});
-                        }
-
-                        if (state == PlayerState.BUFFERING) {
+                                if (!_bufferFull){
+                                        _bufferFull = true;
+                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
+                                }
+                        }
+
+                        if (state == PlayerState.BUFFERING || state == PlayerState.PAUSED) {
                                 //TODO: This works, but it looks weird, as the bufferTime is changing
-                                //sendBufferEvent(_stream.bufferLength / _stream.bufferTime * item.duration);
+                                /*
+                                if (!_bufferFull){
+                                        sendBufferEvent(_stream.bufferLength / _stream.bufferTime * item.duration);
+                                }
+                                */
                         } else if (position < item.duration) {
                                 if (state == PlayerState.PLAYING && position >= 0) {
@@ -200 +227 @@
                         _position = pos;
                         clearInterval(_positionInterval);
+                        _positionInterval = undefined;
                         _stream.seek(position);
-                        _positionInterval = setInterval(positionInterval, 100);
-                        //_stream.resume();
-                        //super.play();
+                        if (!_positionInterval) {
+                                _positionInterval = setInterval(positionInterval, 100);
+                        }
                 }
 
@@ -217 +245 @@
                         _stream.client = new NetClient(this);
                         _video.attachNetStream(_stream);
-                        _positionInterval = setInterval(positionInterval, 100);
+                        if (!_positionInterval) {
+                                _positionInterval = setInterval(positionInterval, 100);
+                        }
                         _stream.play(getID(item.file));
                 }
@@ -242 +272 @@
                                 case 'NetStream.Seek.Notify':
                                         clearInterval(_positionInterval);
-                                        _positionInterval = setInterval(positionInterval, 100);
+                                        _positionInterval = undefined;
+                                        if (!_positionInterval) {
+                                                _positionInterval = setInterval(positionInterval, 100);
+                                        }
                                         break;
                                 case 'NetConnection.Connect.Rejected':
@@ -274 +307 @@
                                         _unpublished = true;
                                         break;
+                                case 'NetStream.Buffer.Full':
+                                        if (!_bufferFull) {
+                                                _bufferFull = true;
+                                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
+                                        }
+                                        break;
                         }
                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: evt.info});
@@ -287 +326 @@
                         _started = false;
                         clearInterval(_positionInterval);
+                        _positionInterval = undefined;
                         super.stop();
                         if (_smil) {

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

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