equal
deleted
inserted
replaced
25 regexp: /\.(mp4|m4v)$/, |
25 regexp: /\.(mp4|m4v)$/, |
26 type: "AdaptivePlayer" |
26 type: "AdaptivePlayer" |
27 }, |
27 }, |
28 { |
28 { |
29 regexp: /\.(ogg|ogv|webm)$/, |
29 regexp: /\.(ogg|ogv|webm)$/, |
30 type: "PopcornPlayer" |
30 type: "HtmlPlayer" |
31 }, |
31 }, |
32 { |
32 { |
33 regexp: /^(https?:\/\/)?(www\.)?youtube\.com/, |
33 regexp: /^(https?:\/\/)?(www\.)?youtube\.com/, |
34 type: "PopcornPlayer" |
34 type: "PopcornPlayer" |
35 }, |
35 }, |
55 _opts.type = this.default_type |
55 _opts.type = this.default_type |
56 } |
56 } |
57 |
57 |
58 if (_opts.type === "AdaptivePlayer") { |
58 if (_opts.type === "AdaptivePlayer") { |
59 var _canPlayType = document.createElement('video').canPlayType("video/mp4"); |
59 var _canPlayType = document.createElement('video').canPlayType("video/mp4"); |
60 _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "PopcornPlayer" : "JwpPlayer"; |
60 _opts.type = (_canPlayType == "maybe" || _canPlayType == "probably") ? "HtmlPlayer" : "JwpPlayer"; |
61 } |
61 } |
62 |
62 |
63 if (_rtmprgx.test(this.video)) { |
63 if (_rtmprgx.test(this.video)) { |
64 _opts.provider = "rtmp"; |
64 _opts.provider = "rtmp"; |
65 _opts.live = true; |
65 _opts.live = true; |