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

Embed: support for new subtitle track format

Browse source
This commit is contained in:
Cat 2017-10-24 16:21:57 +02:00 • committed by Thulinma
parent 0a029d5c5c
commit e75ae50c0c
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
embed/core.js
View file

@ -455,13 +455,13 @@ MistPlayer.prototype.buildMistControls = function(){
if ('name' in tracks[i][j]) { if ('name' in tracks[i][j]) {
name = tracks[i][j].name; name = tracks[i][j].name;
} }
else if ('desc' in tracks[i][j]) {
name = tracks[i][j].desc;
}
else if ('lang' in tracks[i][j]) { else if ('lang' in tracks[i][j]) {
name = tracks[i][j].lang; name = tracks[i][j].lang;
o.setAttribute('data-lang',tracks[i][j].lang); o.setAttribute('data-lang',tracks[i][j].lang);
} }
else if ('desc' in tracks[i][j]) {
name = tracks[i][j].desc;
}
else { else {
name = 'Track '+(Number(j)+1); name = 'Track '+(Number(j)+1);
} }
@ -1148,20 +1148,25 @@ function mistPlay(streamName,options) {
var skip = false; var skip = false;
switch (t.type) { switch (t.type) {
case 'video': case 'video':
t.desc = [t.width+'x'+t.height,/*Math.round(t.bps/1024)+'kbps',*/t.fpks/1e3+'fps',t.codec]; t.desc = [t.width+'x'+t.height,Math.round(t.bps/1024)+'kbps',t.fpks/1e3+'fps',t.codec];
if (t.lang) { if (t.lang) {
t.desc.unshift(t.lang); t.desc.unshift(t.language);
} }
break; break;
case 'audio': case 'audio':
t.desc = [(t.channels == 2 ? 'Stereo' : (t.channels == 1 ? 'Mono' : t.channels+' channels')),/*Math.round(t.bps/1024)+'kbps',*/Math.round(t.rate/1000)+'kHz',t.codec]; t.desc = [(t.channels == 2 ? 'Stereo' : (t.channels == 1 ? 'Mono' : t.channels+' channels')),Math.round(t.bps/1024)+'kbps',Math.round(t.rate/1000)+'kHz',t.codec];
if (t.lang) { if (t.lang) {
t.desc.unshift(t.lang); t.desc.unshift(t.language);
} }
break; break;
case 'meta':
case 'subtitle': case 'subtitle':
t.desc = [t.lang,t.codec]; //subtitles are type meta and codec subtitle in Mist > v2.13, still support type subtitle though
if ((t.type == 'subtitle') || (t.codec == 'subtitle')) {
t.type = "subtitle";
t.desc = [t.language];
break; break;
}
default: default:
skip = true; skip = true;
break; break;