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

Merge remote-tracking branch 'upstream/master' into syncplay

Browse source
This commit is contained in:
gion 2020-05-27 10:42:29 +02:00
commit 385f0a0beb
213 changed files with 3867 additions and 2697 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/playback/playbackmanager.js
View file

@ -314,13 +314,11 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
if (codecProfile.Type === 'Audio') {
(codecProfile.Conditions || []).map(function (condition) {
if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitDepth') {
maxAudioBitDepth = condition.Value;
}
if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') {
maxAudioSampleRate = condition.Value;
}
if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitrate') {
maxAudioBitrate = condition.Value;
return maxAudioBitDepth = condition.Value;
} else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioSampleRate') {
return maxAudioSampleRate = condition.Value;
} else if (condition.Condition === 'LessThanEqual' && condition.Property === 'AudioBitrate') {
return maxAudioBitrate = condition.Value;
}
});
}

4
src/components/playback/playersettingsmenu.js
View file

@ -7,11 +7,13 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
return stream.Type === 'Video';
})[0];
var videoWidth = videoStream ? videoStream.Width : null;
var videoHeight = videoStream ? videoStream.Height : null;
var options = qualityoptions.getVideoQualityOptions({
currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
videoWidth: videoWidth,
videoHeight: videoHeight,
enableAuto: true
});
@ -91,11 +93,13 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
})[0];
var videoWidth = videoStream ? videoStream.Width : null;
var videoHeight = videoStream ? videoStream.Height : null;
var options = qualityoptions.getVideoQualityOptions({
currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
videoWidth: videoWidth,
videoHeight: videoHeight,
enableAuto: true
});