Changeset 915

Timestamp:

04/03/10 13:51:59 (3 years ago)

Author:

jeroen

Message:

fixed #820 issues

Location:

trunk/fl5

Files:

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

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

@@ -57 +57 @@
         /** Level to which we're transitioning. **/
         private var _transitionLevel:Number = -1;
+        /** Save if we want to transition. **/
+        private var _transitionPlanned:Boolean = false;
         /** Video object to be instantiated. **/
         private var _video:Video;
@@ -138 +140 @@
                 return;
             }
-            if (bdw < 100 || bdw > 99999) {
-                return;
-            } else {
-                bdw = Math.round(config.bandwidth / 2 + bdw / 2);
-            }
+            if (bdw < 99 || bdw > 99999) { return; }
             config.bandwidth = bdw;
             Configger.saveCookie('bandwidth', bdw);
             if (item.levels.length > 0 && item.getLevel(config.bandwidth, config.width) != item.currentLevel) {
-                                swap(item.getLevel(config.bandwidth, config.width));
+                                if(_transitionPlanned) {
+                                        swap(item.getLevel(config.bandwidth, config.width));
+                                        _transitionPlanned = false;
+                                } else { 
+                                        _transitionPlanned = true;
+                                }
             }
         }
@@ -284 +287 @@
             }
             if (dat.code == 'NetStream.Play.TransitionComplete') {
-                                if (_transitionLevel >= 0) {
-                                        Logger.log("Transition to level " + item.currentLevel + " complete");
-                        _transitionLevel = -1;
-                                }
+                                if (_transitionLevel >= 0) { _transitionLevel = -1; }
             }
                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_META, {metadata: dat});
@@ -369 +369 @@
                         if (isDVR && pos > _dvrDuration) { pos = _dvrDuration; }
             _transitionLevel = -1;
+                        _transitionPlanned = false;
                         _timeoffset = pos;
             clearInterval(_positionInterval);
@@ -412 +413 @@
                 }
                 if (_dynamic) {
-                    _bandwidthInterval = setInterval(getBandwidth, 2000);
+                    _bandwidthInterval = setInterval(getBandwidth, 1000);
                 }
             }
@@ -568 +569 @@
         /** Dynamically switch streams **/
         private function swap(newLevel:Number):void {
-            if (_transitionLevel == newLevel) {
-                Logger.log('Already tranisitioning to level ' + item.currentLevel + ' ; transition ignored');
-            } else {
+            if (_transitionLevel == -1) {
                 _transitionLevel = newLevel;
                                 item.setLevel(newLevel);
-                Logger.log('transition to level ' + newLevel + ' initiated');
                 var nso:NetStreamPlayOptions = new NetStreamPlayOptions();
                 nso.streamName = getID(item.file);

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

@@ -101 +101 @@
                         for (var i:Number=0; i < _levels.length; i++) {
                                 var level:PlaylistItemLevel = _levels[i] as PlaylistItemLevel;
-                                if (bitrate >= level.bitrate && width >= level.width * 0.9) {
+                                if (bitrate >= level.bitrate * 1.2 && width >= level.width * 0.9) {
                                         return i;
                                 }