# HG changeset patch # User ymh # Date 1440069851 -7200 # Node ID a128e59ca2b15aa05d86909ec129cc459cc5313d # Parent 423a8c6f9c4d5b9838fc1567066259f3e3517c47 change h264 detection for adaptive player + auto player diff -r 423a8c6f9c4d -r a128e59ca2b1 src/widgets/AdaptivePlayer.js --- a/src/widgets/AdaptivePlayer.js Fri Jul 03 17:01:35 2015 +0200 +++ b/src/widgets/AdaptivePlayer.js Thu Aug 20 13:24:11 2015 +0200 @@ -5,7 +5,7 @@ IriSP.Widgets.AdaptivePlayer.prototype = new IriSP.Widgets.Widget(); IriSP.Widgets.AdaptivePlayer.prototype.defaults = { - mime_type: "video/mp4", + mime_type: 'video/mp4; codecs="avc1.42E01E"', normal_player: "HtmlPlayer", fallback_player: "JwpPlayer" }; @@ -20,7 +20,7 @@ _opts = {}, _canPlayType = document.createElement('video').canPlayType(this.mime_type); - _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? this.normal_player : this.fallback_player; + _opts.type = (_canPlayType !== "no") ? this.normal_player : this.fallback_player; for (var i = 0; i < _props.length; i++) { if (typeof this[_props[i]] !== "undefined") { diff -r 423a8c6f9c4d -r a128e59ca2b1 src/widgets/AutoPlayer.js --- a/src/widgets/AutoPlayer.js Fri Jul 03 17:01:35 2015 +0200 +++ b/src/widgets/AutoPlayer.js Thu Aug 20 13:24:11 2015 +0200 @@ -56,8 +56,8 @@ } if (_opts.type === "AdaptivePlayer") { - var _canPlayType = document.createElement('video').canPlayType("video/mp4"); - _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "HtmlPlayer" : "JwpPlayer"; + var _canPlayType = document.createElement('video').canPlayType('video/mp4; codecs="avc1.42E01E"'); + _opts.type = (_canPlayType !== "no") ? "HtmlPlayer" : "JwpPlayer"; } if (_rtmprgx.test(this.video)) {