Changeset 1990

Timestamp:

09/05/11 07:25:06 (21 months ago)

Author:

jeroen

Message:

three small changes to prevent downswitching b/c of unreliable maxBW stats - #1455

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/model/PlaylistItem.as (modified) (1 diff)

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

@@ -542 +542 @@
                         _stream.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
                         _stream.addEventListener(AsyncErrorEvent.ASYNC_ERROR, errorHandler);
-                        if(getConfigProperty('dvr') || getConfigProperty('subscribe')) {
-                                _stream.bufferTime = 3;
+                        if(getConfigProperty('dvr') || getConfigProperty('subscribe') || _dynamic) {
+                                _stream.bufferTime = 4;
                         } else { 
                                 _stream.bufferTime = config.bufferlength;
@@ -701 +701 @@
                 /** Dynamically switch streams **/
                 private function swap(newLevel:Number):void {
-                        if (_transitionLevel == -1) {
+                        if (_transitionLevel == -1 && (newLevel < item.currentLevel || 
+                                _stream.bufferLength < _stream.bufferTime * 1.5 || item.levels[item.currentLevel].blacklisted)) {
                                 _transitionLevel = newLevel;
                                 item.setLevel(newLevel);

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

@@ -149 +149 @@
                         for (var i:Number=0; i < _levels.length; i++) {
                                 var level:PlaylistItemLevel = _levels[i] as PlaylistItemLevel;
-                                if ((isNaN(level.bitrate) || bitrate >= level.bitrate * 1.2) && (isNaN(level.width) || width >= level.width * 0.8) && !level.blacklisted) {
+                                if ((isNaN(level.bitrate) || bitrate >= level.bitrate * 1.5) && (isNaN(level.width) || width >= level.width * 0.67) && !level.blacklisted) {
                                         return i;
                                 }