fix quality options

MediaBrowser · Feb 1, 2016 · 2dbb591 · 2dbb591
1 parent 66325bb
commit 2dbb591
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js
@@ -613,6 +613,7 @@
         self.onQualityOptionSelected = function (bitrate) {
 
             AppSettings.maxStreamingBitrate(bitrate);
+            AppSettings.enableAutomaticBitrateDetection(false);
 
             self.changeStream(self.getCurrentTicks(), {
                 Bitrate: bitrate

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js
@@ -187,14 +187,25 @@
 
             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) {
                         updateDeviceProfileForAndroid(profile);
                     }
                     else if (AppInfo.isNativeApp && browserInfo.safari) {
                         updateDeviceProfileForIOS(profile);
                     }
+
+                    profile.MaxStreamingBitrate = bitrateSetting;
+
                     resolve(profile);
                 });
             });