hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LSP

Browse source 
- ()error at required options
Embed
 - Dash and Flash demand a http stream source when the player is loaded over http
 - put mimetypes together when sorting sources
This commit is contained in:
Cat 2016-11-18 14:07:09 +01:00 • committed by Thulinma
parent f00344f8ca
commit 6276485b66
6 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
embed/wrappers/dashjs.js
View file

@ -5,7 +5,8 @@ mistplayers.dashjs = {
isMimeSupported: function (mimetype) {
return (this.mimes.indexOf(mimetype) == -1 ? false : true);
},
isBrowserSupported: function (mimetype) {
isBrowserSupported: function (mimetype,source,options) {
if ((options.host.substr(0,7) == 'http://') && (source.url.substr(0,8) == 'https://')) { return false; }
return (('dashjs' in window) && ('MediaSource' in window) && (location.protocol != 'file:'));
},
player: function(){}

7
embed/wrappers/flash_strobe.js
View file

@ -5,7 +5,10 @@ mistplayers.flash_strobe = {
isMimeSupported: function (mimetype) {
return (this.mimes.indexOf(mimetype) == -1 ? false : true);
},
isBrowserSupported: function (mimetype) {
isBrowserSupported: function (mimetype,source,options) {
//check for http / https crossovers
if ((options.host.substr(0,7) == 'http://') && (source.url.substr(0,8) == 'https://')) { return false; }
var version = 0;
try {
// check in the mimeTypes
@ -38,7 +41,7 @@ p.prototype.build = function (options) {
ele.setAttribute('width',options.width);
ele.setAttribute('height',options.height);
ele.appendChild(createParam('movie',options.source.player_url));
ele.appendChild(createParam('movie',options.host+options.source.player_url));
var flashvars = 'src='+encodeURIComponent(options.src)+'&controlBarMode='+(options.controls ? 'floating' : 'none')+'&initialBufferTime=0.5&expandedBufferTime=5&minContinuousPlaybackTime=3'+(options.live ? '&streamType=live' : '')+(options.autoplay ? '&autoPlay=true' : '' );
ele.appendChild(createParam('flashvars',flashvars));
ele.appendChild(createParam('allowFullScreen','true'));