- fixes as a result of documentation, fixed secondaryVideo
- added muted option, changing tracks sets options.setTracks
- no positive values for startunix when live seeking
- dashjs tracks updated, videojs display tweaked
- fixes for track selection and live seeking
This commit is contained in:
Cat 2018-12-20 16:48:39 +01:00 committed by Thulinma
parent 0a1b00cb5e
commit 998d7c6d03
22 changed files with 283 additions and 119 deletions

View file

@ -213,10 +213,8 @@ var MistUtil = {
if (sorting) {
if (typeof sorting != "function") {
sorting = function(keya,keyb){
if (keya > keyb) { return 1; }
if (keya < keyb) { return -1; }
return 0;
sorting = function(a,b){
return a.localeCompare(b);
};
}
@ -764,6 +762,22 @@ var MistUtil = {
var d = MistUtil.object.values(different);
output[type][i].displayName = (d.length ? d.join(", ") : MistUtil.object.values(output[type][i].describe).join(" "));
}
//check if some tracks have the same display name
var names = {};
for (var i in output[type]) {
if (output[type][i].displayName in names) {
//we have double names, add the track id
var n = 1;
for (var i in output[type]) {
output[type][i].different.trackid = n+")";
output[type][i].displayName = "Track "+n+" ("+output[type][i].displayName+")";
n++;
}
break;
}
names[output[type][i].displayName] = 1;
}
}
return output;