Changeset 760

Timestamp:

12/16/09 06:53:43 (4 years ago)

Author:

jeroen

Message:

added fix for http bitrate switch on LOAD, saved last bandwidth in a cookie, evened out FMS3.5 bandwidth callbacks and added rtmpt to the testing bitrate switches (can be throttles with Charles)

Files:

• testing/files/bitrates.xml (modified) (2 diffs)
• trunk/as3/com/jeroenwijering/models/HTTPModel.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/models/RTMPModel.as (modified) (10 diffs)
• trunk/as3/com/jeroenwijering/models/VideoModel.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/player/Player.as (modified) (1 diff)
• trunk/as3/player.swf (modified) (previous)

testing/files/bitrates.xml

@@ -33 +33 @@
                         <description>Bitrate switching for RTMP streaming is done on startup and with every seek and fullscreen switch.</description>
                         <media:group>
-                                <media:content bitrate="1600" width="1080" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-67727.mp4" />
-                                <media:content bitrate="1200" width="720" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-485.mp4" />
-                                <media:content bitrate="800" width="480" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-484.mp4" />
-                                <media:content bitrate="400" width="320" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-483.mp4" />
+                                <media:content bitrate="1600" width="1080" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-67727.mp4?dopproto=rtmpt" />
+                                <media:content bitrate="1200" width="720" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-485.mp4?dopproto=rtmpt" />
+                                <media:content bitrate="800" width="480" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-484.mp4?dopproto=rtmpt" />
+                                <media:content bitrate="400" width="320" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-483.mp4?dopproto=rtmpt" />
                                 <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
                         </media:group>
@@ -54 +54 @@
                         </media:group>
                         <jwplayer:type>rtmp</jwplayer:type>
-                        <jwplayer:streamer>rtmp://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
+                        <jwplayer:streamer>rtmpt://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
                 </item>
 

trunk/as3/com/jeroenwijering/models/HTTPModel.as

@@ -91 +91 @@
 
 
-        /** Bandwidth is checked every four seconds as long as there's loading. **/
+        /** Bandwidth is checked every two seconds as long as there's loading. **/
         private function getBandwidth(old:Number):void {
                 var ldd:Number = stream.bytesLoaded;
                 var bdw:Number = Math.round((ldd-old)*4/1000);
                 if(ldd < stream.bytesTotal) {
-                        if(bdw > 0) { model.config['bandwidth'] = bdw; }
+                        if(bdw > 0) { 
+                                model.config['bandwidth'] = bdw;
+                                Configger.saveCookie('bandwidth',bdw);
+                        }
                         if(bwswitch) {
                                 bwswitch = false;
                                 if(item['levels'] && getLevel() != model.config['level']) {
-                                        byteoffset = -1;
-                                        seek(position);
+                                        load(item);
                                         return;
                                 }

trunk/as3/com/jeroenwijering/models/RTMPModel.as

@@ -30 +30 @@
         /** Is dynamic streaming possible. **/
         private var dynamics:Boolean;
+        /** The currently playing RTMP stream. **/
+        private var file:String;
         /** ID for the position interval. **/
         private var interval:Number;
@@ -101 +103 @@
         /** Bandwidth checking for dynamic streaming. **/
         private function getBandwidth():void {
-                try { 
-                        model.config['bandwidth'] = Math.round(stream.info.maxBytesPerSecond*8/1024);
+                try {
+                        var bdw:Number = Math.round(stream.info.maxBytesPerSecond*8/1024);
                 } catch(err:Error) { 
                         clearInterval(bwinterval);
-                }
+                        return;
+                }
+                if(bdw < 100 || bdw > 99999) {
+                        return;
+                } else {
+                        bdw = Math.round(model.config['bandwidth']/2+bdw/2);
+                }
+                model.config['bandwidth'] = bdw;
+                Configger.saveCookie('bandwidth',bdw);
                 if(item['levels'] && getLevel() != model.config['level']) {
                         swap();
@@ -115 +125 @@
         private function getID(url:String):String {
                 var ext:String = url.substr(-4);
-                if(model.config['rtmp.prepend'] == false) {
+                if(url.indexOf(':') > -1) {
                         return url;
                 } else if(ext == '.mp3') {
@@ -208 +218 @@
                 if(dat.type == 'bandwidth') {
                         model.config['bandwidth'] = dat.bandwidth;
+                        Configger.saveCookie('bandwidth',dat.bandwidth);
                         setStream();
                 }
@@ -281 +292 @@
                 clearInterval(interval);
                 clearInterval(bwinterval);
-                interval = setInterval(positionInterval,100);
                 if(item['levels'] && getLevel() != model.config['level']) {
                         model.config['level'] = getLevel();
@@ -299 +309 @@
                         stream.play(getID(item['file']),0,-1);
                 } else {
-                        stream.play(getID(item['file']));
+                        if(file != item['file']) {
+                                file = item['file'];
+                                stream.play(getID(item['file']));
+                        }
                         if(timeoffset) { stream.seek(timeoffset); }
                         if(dynamics) {
@@ -306 +319 @@
                 }
                 streaming = true;
+                interval = setInterval(positionInterval,100);
         };
 
@@ -348 +362 @@
                                                 setStream();
                                         }
-                                        if(item['file'].substr(-4) == '.mp3') { 
+                                        if(item['file'].substr(-4) == '.mp3' || item['file'].substr(0,4) == 'mp3:') { 
                                                 connection.call("getStreamLength",new Responder(streamlengthHandler),getID(item['file']));
                                         }
@@ -401 +415 @@
                 if(stream && stream.time) { stream.close(); }
                 streaming = false;
+                file = undefined;
                 connection.close();
                 clearInterval(interval);
@@ -428 +443 @@
                         model.config['level'] = getLevel();
                         Logger.log('transition to level '+getLevel()+' initiated');
-                        item['file'] = item['levels'][model.config['level']].url;
+                        item['file'] = file = item['levels'][model.config['level']].url;
                         var nso:NetStreamPlayOptions = new NetStreamPlayOptions();
                         nso.streamName = getID(item['file']);

trunk/as3/com/jeroenwijering/models/VideoModel.as

@@ -68 +68 @@
                 var bdw:Number = Math.round((ldd-old)*4/1000);
                 if(ldd < stream.bytesTotal) {
-                        if(bdw > 0) { model.config['bandwidth'] = bdw; }
+                        if(bdw > 0) { 
+                                model.config['bandwidth'] = bdw;
+                                Configger.saveCookie('bandwidth',bdw);
+                        }
                         if(bwswitch) {
                                 bwswitch = false;

trunk/as3/com/jeroenwijering/player/Player.as

@@ -47 +47 @@
 
                 autostart:false,
-                bandwidth:5000,
+                bandwidth:1500,
                 bufferlength:1,
                 displayclick:'play',