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

improve m3u channel list parsing

Browse source
This commit is contained in:
Luke Pulverenti 2016-12-07 15:03:00 -05:00
parent 835ed1dfae
commit dcb44815ed
9 changed files with 59 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

52
dashboard-ui/bower_components/emby-apiclient/apiclient.js vendored
View file

@ -669,23 +669,53 @@
});
};
self.detectBitrate = function () {
function normalizeReturnBitrate(bitrate) {
// First try a small amount so that we don't hang up their mobile connection
return self.getDownloadSpeed(1000000).then(function (bitrate) {
if (!bitrate) {
return Promise.reject();
}
if (bitrate < 1000000) {
return Math.round(bitrate * 0.8);
return Math.round(bitrate * 0.8);
}
function detectBitrateInternal(tests, index, currentBitrate) {
if (index >= tests.length) {
return normalizeReturnBitrate(currentBitrate);
}
var test = tests[0];
return self.getDownloadSpeed(test.bytes).then(function (bitrate) {
if (bitrate < test.threshold) {
return normalizeReturnBitrate(bitrate);
} else {
// If that produced a fairly high speed, try again with a larger size to get a more accurate result
return self.getDownloadSpeed(2400000).then(function (bitrate) {
return Math.round(bitrate * 0.8);
});
return detectBitrateInternal(tests, index + 1, bitrate);
}
}, function () {
return normalizeReturnBitrate(currentBitrate);
});
}
self.detectBitrate = function () {
return detectBitrateInternal([
{
bytes: 100000,
threshold: 5000000
},
{
bytes: 1000000,
threshold: 50000000
},
{
bytes: 3000000,
threshold: 50000000
}], 0);
};
/**

6
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -240,7 +240,7 @@ define(['browser'], function (browser) {
return function (options) {
options = options || {};
var physicalAudioChannels = options.audioChannels || 2;
var physicalAudioChannels = options.audioChannels || (browser.tv || browser.xboxOne || browser.ps4 ? 6 : 2);
var bitrateSetting = getMaxBitrate();
@ -334,12 +334,12 @@ define(['browser'], function (browser) {
AudioCodec: videoAudioCodecs.join(',')
});
}
if (browser.tizen) {
mp4VideoCodecs.push('mpeg2video');
mp4VideoCodecs.push('vc1');
}
if (canPlayMkv && mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({
Container: 'mkv',

5
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -310,7 +310,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
textlines.push(displayName);
}
if (options.artist !== false) {
if (options.artist !== false && (options.artist === true || item.AlbumArtist !== options.containerAlbumArtist)) {
if (item.ArtistItems && item.Type !== 'MusicAlbum') {
textlines.push(item.ArtistItems.map(function (a) {
return a.Name;
@ -318,7 +319,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}).join(', '));
}
if (item.AlbumArtist && item.Type === 'MusicAlbum') {
else if (item.AlbumArtist && item.Type === 'MusicAlbum') {
textlines.push(item.AlbumArtist);
}
}