Changeset 2217 for branches/jw6/src/flash/com/longtailvideo/jwplayer/model/PlaylistItem.as

Timestamp:

05/30/12 06:05:55 (12 months ago)

Author:

pablo

Message:

• Implements quality API
• Implements new error states
• removes CDN aliases
• removes shuffle option
• removes alternate playlist parsers (ASX, ATOM, XSPF, SMIL)
• Addresses a cross-site scripting vulnerability (javajavascript:script:alert('xss'))
• Embedder now has minimum flash version requirement (10.0)
• JS Plugins no longer have to have a public resize function to have the div displayed

File:

• branches/jw6/src/flash/com/longtailvideo/jwplayer/model/PlaylistItem.as (modified) (9 diffs)

branches/jw6/src/flash/com/longtailvideo/jwplayer/model/PlaylistItem.as

@@ -24 +24 @@
                 protected var _streamer:String          = "";
                 
-                protected var _currentLevel:Number      = -1;
+                protected var _type:String                      = null;
+                protected var _currentLevel:Number      = 0;
                 protected var _levels:Array                     = [];
                 
@@ -58 +59 @@
                                         for each (var level:Object in levels) {
                                                 if (level['file']) {
-                                                        var newLevel:PlaylistItemLevel = new PlaylistItemLevel(level['file'], 
+                                                        var newLevel:PlaylistItemLevel = new PlaylistItemLevel(level['file'],
+                                                                level['type'],
                                                                 Number(level['bitrate']), 
                                                                 Number(level['width']), 
@@ -65 +67 @@
                                                                 switch(otherProp) {
                                                                         case "file":
+                                                                        case "type":
                                                                         case "bitrate":
                                                                         case "width":
@@ -125 +128 @@
                 public function addLevel(newLevel:PlaylistItemLevel):void {
                         if (validExtension(newLevel)) {
-                                if (_currentLevel < 0) _currentLevel = 0;
+                                // Removing playlist level sorting
+/*                              if (_currentLevel < 0) _currentLevel = 0;
                                 for (var i:Number = 0; i < _levels.length; i++) {
                                         var level:PlaylistItemLevel = _levels[i] as PlaylistItemLevel;
@@ -136 +140 @@
                                         }
                                 }
+*/
                                 _levels.push(newLevel);
                         }
@@ -160 +165 @@
                  **/
                 protected function validExtension(level:Object):Boolean {
-                        return levelType(level);
+                        if (_type) {
+                                return (typeMap(levelType(level)) == typeMap(_type));
+                        } else {
+                                var lType = levelType(level);
+                                if (lType) {
+                                        if (typeMap(lType)) {
+                                                _type = lType;
+                                                return true;
+                                        }
+                                } else {
+                                        // No valid extension, but if provider is set manually, try to play using that provider.
+                                        if (_provider) return true;
+                                }
+                        }
+                        return false;
                 }
 
                 public function get currentLevel():Number {
                         return _currentLevel;
-                }
-                
-                public function getLevel(bitrate:Number, width:Number):Number {
-                        for (var i:Number=0; i < _levels.length; i++) {
-                                var level:PlaylistItemLevel = _levels[i] as PlaylistItemLevel;
-                                if ((isNaN(level.bitrate) || bitrate >= level.bitrate * 1.5) && (isNaN(level.width) || width >= level.width * 0.67) && !level.blacklisted) {
-                                        return i;
-                                }
-                        }
-                        return _levels.length - 1;
                 }
                 
@@ -215 +224 @@
                 private function levelType(level:Object):String {
                         if (level) {
-                                var type:String = level.type ? level.type : Strings.extension(level.file);
-                                switch (type) {
-                                        case "flv": 
-                                        case "f4v": 
-                                        case "mov": 
-                                        case "m4a": 
-                                        case "m4v": 
-                                        case "mp4": 
-                                        case "aac": 
-                                                return "video";
-                                                break;
-                                        case "mp3": 
-                                                return "sound";
-                                                break;
-                                        case  "smil":
-                                                return "rtmp";
-                                                break;
-                                        case "m3u8": 
-                                                return "hls";
-                                                break;
+                                if (level.type) return level.type;
+                                else {
+                                        if (level.streamer) return "rtmp";
+                                        else if (level.file) {
+                                                if (Strings.isYouTube(level.file)) return "youtube";
+                                                else {
+                                                        return extensionMap(Strings.extension(level.file));
+                                                }
+                                        }
                                 }
+                        }
+                        return null;
+                }
+                
+                private function extensionMap(extension:String):String {
+                        switch (extension) {
+                                case "flv": 
+                                        return "flv";
+                                case "f4v":
+                                case "m4v": 
+                                case "mp4":
+                                        return "mp4";
+                                case "m4a": 
+                                case "aac":
+                                case "f4a":
+                                        return "aac";
+                                        break;
+                                case "mp3":
+                                        return "mp3";
+                                        break;
+                                case "smil":
+                                        return "rtmp";
+                                        break;
+                                case "m3u8": 
+                                        return "hls";
+                                        break;
+                                case "webm":
+                                        return "webm";
+                                        break;
+                                case "ogg":
+                                case "oga":
+                                        return "vorbis";
+                                        break;
+                        }
+                        return null;
+                }
+                
+                private function typeMap(type:String):String {
+                        switch (type) {
+                                case "flv":
+                                case "mp4":
+                                case "aac":
+                                case "video": 
+                                        return "video";
+                                        break;
+                                case "mp3": 
+                                case "sound": 
+                                        return "sound";
+                                        break;
+                                case "rtmp":
+                                        return "rtmp";
+                                        break;
+                                case "hls": 
+                                        return "hls";
+                                        break;
                         }
                         return null;
@@ -244 +297 @@
                                 return _provider;
                         } else if (_levels.length > 0) {
-                                return levelType(_levels[_currentLevel]); 
+                                return typeMap(levelType(_levels[_currentLevel])); 
                         }
                         return null;
@@ -253 +306 @@
                 
                 public function get type():String {
-                        if (_levels.length > 0) {
-                                var level:Object = _levels[_currentLevel]; 
-                                return level.type ? level.type : Strings.extension(level.file);
-                        } else return null;
+                        return _type;
                 }