Changeset 1244

Timestamp:

08/27/10 14:38:59 (3 years ago)

Author:

zach

Message:

• Fixing issue with file extensions (#953)

Location:

branches/html5

Files:

• jwplayer.html5.js (modified) (3 diffs)
• jwplayer.html5.xml (modified) (1 diff)
• src/html5/jwplayer.html5.extensionmap.js (added)
• src/html5/jwplayer.html5.mediavideo.js (modified) (1 diff)
• src/html5/jwplayer.html5.model.js (modified) (1 diff)

branches/html5/jwplayer.html5.js

@@ -1548 +1548 @@
  */
 (function(jwplayer) {
+        jwplayer.html5.extensionmap = {
+                "3gp": "video/3gpp",
+                "3gpp": "video/3gpp",
+                "3g2": "video/3gpp2",
+                "3gpp2": "video/3gpp2",
+                "flv": "video/x-flv",
+                "f4a": "audio/mp4",
+                "f4b": "audio/mp4",
+                "f4p": "video/mp4",
+                "f4v": "video/mp4",
+                "mov": "video/quicktime",
+                "m4a": "audio/mp4",
+                "m4b": "audio/mp4",
+                "m4p": "audio/mp4",
+                "m4v": "video/mp4",
+                "mkv": "video/x-matroska",
+                "mp4": "video/mp4",
+                "sdp": "application/sdp",
+                "vp6": "video/x-vp6",
+                "aac": "audio/aac",
+                "mp3": "audio/mp3",
+                "ogg": "audio/ogg",
+                "ogv": "video/ogg",
+                "webm": "video/webm"
+        };
+})(jwplayer);
+/**
+ * JW Player Video Media component
+ *
+ * @author zach
+ * @version 1.0
+ */
+(function(jwplayer) {
 
         var _states = {
@@ -1857 +1890 @@
                                 if (sourceModel.type === undefined) {
                                         var extension = jwplayer.html5.utils.extension(sourceModel.file);
-                                        if (extension == "ogv") {
-                                                extension = "ogg";
+                                        if (jwplayer.html5.extensionmap[extension] !== undefined) {
+                                                source.type = jwplayer.html5.extensionmap[extension];
+                                        } else {
+                                                source.type = 'video/' + extension + ';';                                               
                                         }
-                                        source.type = 'video/' + extension + ';';
                                 } else {
                                         source.type = sourceModel.type;
@@ -1934 +1968 @@
                 
                 //TODO: Figure out how to handle plugins / components
-                //jwplayer.utils.extend(_model.config, options);
                 
                 for (var option in options) {

branches/html5/jwplayer.html5.xml

@@ -24 +24 @@
                         <description>location of the poster image; shown before the video starts and after it has completed.</description>
                 </flashvar>
+                <flashvar type="field"> 
+                        <name>start</name> 
+                        <default>0</default> 
+                        <description>position in seconds where playback has to start. Won't work for regular (progressive) videos, but only for streaming (HTTP/RTMP).</description> 
+                </flashvar> 
         </flashvars>
 

branches/html5/src/html5/jwplayer.html5.mediavideo.js

@@ -315 +315 @@
                                 if (sourceModel.type === undefined) {
                                         var extension = jwplayer.html5.utils.extension(sourceModel.file);
-                                        if (extension == "ogv") {
-                                                extension = "ogg";
+                                        if (jwplayer.html5.extensionmap[extension] !== undefined) {
+                                                source.type = jwplayer.html5.extensionmap[extension];
+                                        } else {
+                                                source.type = 'video/' + extension + ';';                                               
                                         }
-                                        source.type = 'video/' + extension + ';';
                                 } else {
                                         source.type = sourceModel.type;

branches/html5/src/html5/jwplayer.html5.model.js

@@ -42 +42 @@
                 
                 //TODO: Figure out how to handle plugins / components
-                //jwplayer.utils.extend(_model.config, options);
                 
                 for (var option in options) {