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

14
embed/core.js
View file

@ -572,13 +572,10 @@ function mistPlay(streamName,options) {
//embedLog('Stream info contents: '+JSON.stringify(streaminfo));
streaminfo.initTime = new Date();
//sort the sources by priority, but prefer HTTPS
//sort the sources by priority and mime, but prefer HTTPS
streaminfo.source.sort(function(a,b){
function g(s) {
return s.priority + (s.url.indexOf('https://') > -1 ? 0.1 : 0)
}
return g(b) - g(a);
})
return (b.priority - a.priority) || a.type.localeCompare(b.type) || b.url.localeCompare(a.url);
});
var mistPlayer = false;
var source;
@ -625,7 +622,7 @@ function mistPlay(streamName,options) {
function checkMime(p_shortname,mime) {
for (var s in streaminfo.source) {
if (streaminfo.source[s].type == mime) {
if (mistplayers[p_shortname].isBrowserSupported(mime)) {
if (mistplayers[p_shortname].isBrowserSupported(mime,streaminfo.source[s],options)) {
embedLog('Found a working combo: '+mistplayers[p_shortname].name+' with '+mime+' @ '+streaminfo.source[s].url);
streaminfo.working[p_shortname].push(mime);
if (!source) {
@ -666,7 +663,8 @@ function mistPlay(streamName,options) {
live: (streaminfo.type == 'live' ? true : false),
initTime: streaminfo.initTime,
meta: streaminfo.meta,
source: source
source: source,
host: options.host
};
//pass player options and handle defaults
playerOpts.autoplay = options.autoplay;