mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix quality options

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-01 15:41:56 -05:00
parent dcb85ffe74
commit b4d17e1a5f
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -613,6 +613,7 @@
self.onQualityOptionSelected = function (bitrate) { self.onQualityOptionSelected = function (bitrate) {
AppSettings.maxStreamingBitrate(bitrate); AppSettings.maxStreamingBitrate(bitrate);
AppSettings.enableAutomaticBitrateDetection(false);
self.changeStream(self.getCurrentTicks(), { self.changeStream(self.getCurrentTicks(), {
Bitrate: bitrate Bitrate: bitrate

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

@ -187,7 +187,15 @@
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
require(['browserdeviceprofile'], function (profile) { require(['browserdeviceprofile', 'qualityoptions'], function (profile, qualityoptions) {
var bitrateSetting = AppSettings.maxStreamingBitrate();
if (!maxHeight) {
maxHeight = qualityoptions.getVideoQualityOptions(bitrateSetting).filter(function (q) {
return q.selected;
})[0].maxHeight;
}
if (AppInfo.isNativeApp && browserInfo.android) { if (AppInfo.isNativeApp && browserInfo.android) {
updateDeviceProfileForAndroid(profile); updateDeviceProfileForAndroid(profile);
@ -195,6 +203,9 @@
else if (AppInfo.isNativeApp && browserInfo.safari) { else if (AppInfo.isNativeApp && browserInfo.safari) {
updateDeviceProfileForIOS(profile); updateDeviceProfileForIOS(profile);
} }
profile.MaxStreamingBitrate = bitrateSetting;
resolve(profile); resolve(profile);
}); });
}); });