milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

completed tuner hosts

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-21 00:22:46 -04:00
parent 0e4e4da6c8
commit 68526e2c1d
13 changed files with 248 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/scripts/mediaplayer.js
View file

@ -58,6 +58,7 @@
options.push({ name: '1080p - 8Mbps', maxHeight: 1080, bitrate: 8000001 });
options.push({ name: '1080p - 6Mbps', maxHeight: 1080, bitrate: 6000001 });
options.push({ name: '1080p - 5Mbps', maxHeight: 1080, bitrate: 5000001 });
options.push({ name: '1080p - 4Mbps', maxHeight: 1080, bitrate: 4000002 });
} else if (maxAllowedWidth >= 1260) {
options.push({ name: '720p - 10Mbps', maxHeight: 720, bitrate: 10000000 });
@ -119,14 +120,22 @@
})[0].maxHeight;
}
var isVlc = AppInfo.isNativeApp && $.browser.android;
var bitrateSetting = AppSettings.maxStreamingBitrate();
if (isVlc) {
// Work around vlc 1080p stutter for now
if ((maxHeight || 1080) >= 1080) {
bitrateSetting = Math.min(bitrateSetting, 4000002);
}
}
var canPlayWebm = self.canPlayWebm();
var profile = {};
profile.MaxStreamingBitrate = bitrateSetting;
profile.MaxStaticBitrate = 40000000;
profile.MaxStaticBitrate = 4000000;
profile.MusicStreamingTranscodingBitrate = Math.min(bitrateSetting, 192000);
profile.DirectPlayProfiles = [];
@ -303,8 +312,6 @@
}]
});
var isVlc = AppInfo.isNativeApp && $.browser.android;
if (!isVlc) {
profile.CodecProfiles.push({
Type: 'VideoAudio',