Changeset 88 for trunk/as3/com/jeroenwijering/models/HTTPModel.as

Timestamp:

10/20/08 08:16:10 (5 years ago)

Author:

jeroen

Message:

merged 4.2 player to trunk

File:

• trunk/as3/com/jeroenwijering/models/HTTPModel.as (modified) (9 diffs)

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

@@ -1 +1 @@
 /**
-* Wrapper for playback of progressively downloaded video.
+* Wrapper for playback of http 'streaming' video.
 **/
 package com.jeroenwijering.models {
@@ -16 +16 @@
 import flash.utils.clearInterval;
 import flash.utils.setInterval;
-import flash.utils.Timer;
 
 
@@ -46 +45 @@
         /** Byteposition to which the file has been loaded. **/
         private var loaded:Number;
-        /** Timer for checking bandwidth **/
-        private var timer:Timer
 
 
@@ -103 +100 @@
         /** Load content. **/
         public function load():void {
+                model.mediaHandler(video);
                 if(stream.bytesLoaded != stream.bytesTotal) {
                         stream.close();
@@ -123 +121 @@
                 url += '&client='+encodeURI(model.config['client']);
                 url += '&version='+encodeURI(model.config['version']);
+                url += '&width='+model.config['width'];
                 if(getToken()) { url += '&token='+getToken(); }
-                trace(url);
                 stream.play(url);
                 clearInterval(loadinterval);
@@ -136 +134 @@
         /** Interval for the loading progress **/
         private function loadHandler():void {
-                if(!timer) { 
-                        timer = new Timer(2000,1);
-            timer.addEventListener("timer", timerHandler);
-            timer.start();
-                }
                 loaded = stream.bytesLoaded;
                 var ttl = stream.bytesTotal;
@@ -162 +155 @@
                                 video.width = dat.width;
                                 video.height = dat.height;
-                                model.mediaHandler(video);
-                        } else {
-                                model.mediaHandler();
                         }
                         if(dat.seekpoints) {
@@ -244 +234 @@
                 } else if(evt.info.code == "NetStream.Play.StreamNotFound") {
                         stop();
-                        model.sendEvent(ModelEvent.ERROR,{message:"Video stream not found: " + 
+                        model.sendEvent(ModelEvent.ERROR,{message:"Video stream not found: " +
                                 model.playlist[model.config['item']]['file']});
                 } else { 
@@ -274 +264 @@
                 if(bfr<100 && pos < Math.abs(dur-stream.bufferTime*2)) {
                         model.sendEvent(ModelEvent.BUFFER,{percentage:bfr});
-                        if(model.config['state'] != ModelStates.BUFFERING  && bfr<50) {
+                        if(model.config['state'] != ModelStates.BUFFERING  && bfr < 10) {
                                 model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.BUFFERING});
                         }
                 } else if (model.config['state'] == ModelStates.BUFFERING) {
                         model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.PLAYING});
-                        if(!keyframes) {
-                                video.width = 320;
-                                video.height = 240;
-                                model.mediaHandler(video);
-                        }
                 }
                 if(dur > 0) {
                         model.sendEvent(ModelEvent.TIME,{position:pos,duration:dur});
                 }
-        };
-
-
-        /** Timer that checks bandwidth has completed. **/
-        public function timerHandler(event:TimerEvent):void {
-        var bww = Math.round(stream.bytesLoaded*4/1024);
-                model.sendEvent(ModelEvent.META,{bandwidth:bww});
         };