Mercurial Mercurial > platform / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AutoPlayer/AdaptivePlayer bugfix
authorveltr
Tue, 06 Nov 2012 18:45:13 +0100
changeset 907 8fd1b95f04ef
parent 906 fc6f9b50a326
child 908 03a00e8f2e3b
AutoPlayer/AdaptivePlayer bugfix
src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js file | annotate | diff | comparison | revisions
src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js	Tue Nov 06 18:00:21 2012 +0100
+++ b/src/ldt/ldt/static/ldt/metadataplayer/AutoPlayer.js	Tue Nov 06 18:45:13 2012 +0100
@@ -55,6 +55,11 @@
         _opts.type = this.default_type
     }
     
+    if (_opts.type === "AdaptivePlayer") {
+        var _canPlayType = document.createElement('video').canPlayType("video/mp4");
+        _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "PopcornPlayer" : "JwpPlayer";
+    }
+    
     if (_rtmprgx.test(this.video)) {
         _opts.provider = "rtmp";
         _opts.live = true;
--- a/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js	Tue Nov 06 18:00:21 2012 +0100
+++ b/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js	Tue Nov 06 18:45:13 2012 +0100
@@ -1290,6 +1290,9 @@
         noCss: true,
         requires: [ "swfObject" ]
     },
+    AdaptivePlayer: {
+        noCss: true
+    },
     AutoPlayer: {
         noCss: true
     },
platform