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

encode with qsv

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-06 10:02:22 -05:00
parent 67524136ed
commit 64dfb8ef38
42 changed files with 945 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -271,7 +271,7 @@
// Sometimes this fails
try {
//hlsPlayer.destroy();
hlsPlayer.destroy();
}
catch (err) {
Logger.log(err);
@ -348,7 +348,7 @@
else {
if (hlsPlayer) {
//hlsPlayer.destroy();
hlsPlayer.destroy();
hlsPlayer = null;
}

48
dashboard-ui/scripts/librarybrowser.js
View file

@ -1259,7 +1259,7 @@
if (item.ImageTags.Primary) {
imgUrl = ApiClient.getScaledImageUrl(item.Id, {
width: downloadWidth,
maxWidth: downloadWidth,
tag: item.ImageTags.Primary,
type: "Primary",
index: 0,
@ -1271,7 +1271,7 @@
imgUrl = ApiClient.getScaledImageUrl(item.AlbumId, {
type: "Primary",
width: downloadWidth,
maxWidth: downloadWidth,
tag: item.AlbumPrimaryImageTag,
minScale: minScale
});
@ -1281,7 +1281,7 @@
imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, {
type: "Primary",
width: downloadWidth,
maxWidth: downloadWidth,
tag: item.SeriesPrimaryImageTag,
minScale: minScale
});
@ -1291,7 +1291,7 @@
imgUrl = ApiClient.getImageUrl(item.ParentPrimaryImageItemId, {
type: "Primary",
width: downloadWidth,
maxWidth: downloadWidth,
tag: item.ParentPrimaryImageTag,
minScale: minScale
});
@ -1773,6 +1773,7 @@
}
var showTitle = options.showTitle == 'auto' ? true : options.showTitle;
var coverImage = options.coverImage;
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
@ -1781,11 +1782,14 @@
imgUrl = ApiClient.getImageUrl(item.Id, {
type: "Primary",
height: height,
width: width,
maxHeight: height,
maxWidth: width,
tag: item.ImageTags.Primary,
enableImageEnhancers: enableImageEnhancers
});
if (height != null) {
coverImage = true;
}
} else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) {
@ -1858,18 +1862,20 @@
imgUrl = ApiClient.getImageUrl(item.Id, {
type: "Primary",
height: height,
width: width,
maxHeight: height,
maxWidth: width,
tag: item.ImageTags.Primary,
enableImageEnhancers: enableImageEnhancers
});
if (height != null) {
coverImage = true;
}
}
else if (item.ParentPrimaryImageTag) {
imgUrl = ApiClient.getImageUrl(item.ParentPrimaryImageItemId, {
type: "Primary",
width: posterWidth,
maxWidth: posterWidth,
tag: item.ParentPrimaryImageTag,
enableImageEnhancers: enableImageEnhancers
});
@ -1881,12 +1887,14 @@
imgUrl = ApiClient.getScaledImageUrl(item.AlbumId, {
type: "Primary",
height: height,
width: width,
maxHeight: height,
maxWidth: width,
tag: item.AlbumPrimaryImageTag,
enableImageEnhancers: enableImageEnhancers
});
if (width != null) {
coverImage = true;
}
}
else if (item.Type == 'Season' && item.ImageTags && item.ImageTags.Thumb) {
@ -2005,7 +2013,7 @@
if (icon) {
imageCssClass += " iconCardImage";
}
if (options.coverImage) {
if (coverImage) {
imageCssClass += " coveredCardImage";
}
if (options.centerImage) {
@ -3043,7 +3051,7 @@
url = ApiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
height: imageHeight,
maxHeight: imageHeight,
tag: item.ImageTags.Thumb
});
shape = 'thumb';
@ -3052,7 +3060,7 @@
url = ApiClient.getScaledImageUrl(item.Id, {
type: "Primary",
height: imageHeight,
maxHeight: imageHeight,
tag: item.ImageTags.Primary
});
detectRatio = true;
@ -3061,7 +3069,7 @@
url = ApiClient.getScaledImageUrl(item.Id, {
type: "Backdrop",
height: imageHeight,
maxHeight: imageHeight,
tag: item.BackdropImageTags[0]
});
shape = 'thumb';
@ -3070,7 +3078,7 @@
url = ApiClient.getScaledImageUrl(item.Id, {
type: "Thumb",
height: imageHeight,
maxHeight: imageHeight,
tag: item.ImageTags.Thumb
});
shape = 'thumb';
@ -3079,7 +3087,7 @@
url = ApiClient.getScaledImageUrl(item.Id, {
type: "Disc",
height: imageHeight,
maxHeight: imageHeight,
tag: item.ImageTags.Disc
});
shape = 'square';
@ -3088,7 +3096,7 @@
url = ApiClient.getScaledImageUrl(item.AlbumId, {
type: "Primary",
height: imageHeight,
maxHeight: imageHeight,
tag: item.AlbumPrimaryImageTag
});
shape = 'square';

7
dashboard-ui/scripts/librarylist.js
View file

@ -42,13 +42,12 @@
html += '<div style="margin-bottom:1em;">';
var logoHeight = isSmallItem || isMiniItem ? 20 : 26;
var maxLogoWidth = isPortrait ? 100 : 200;
var imgUrl;
if (parentName && item.ParentLogoItemId) {
imgUrl = ApiClient.getScaledImageUrl(item.ParentLogoItemId, {
height: logoHeight,
maxHeight: logoHeight,
type: 'logo',
tag: item.ParentLogoImageTag
});
@ -59,7 +58,7 @@
else if (item.ImageTags.Logo) {
imgUrl = ApiClient.getScaledImageUrl(item.Id, {
height: logoHeight,
maxHeight: logoHeight,
type: 'logo',
tag: item.ImageTags.Logo
});
@ -769,7 +768,7 @@
logoUrl = ApiClient.getScaledImageUrl(item.Id, {
type: "Logo",
index: 0,
height: logoHeight,
maxHeight: logoHeight,
tag: item.ImageTags.Logo
});
}

2
dashboard-ui/scripts/site.js
View file

@ -2397,7 +2397,7 @@ var AppInfo = {};
cordova.getAppVersion.getVersionNumber(function (appVersion) {
var capablities = Dashboard.capabilities();
var name = $.browser.android ? "Emby for Android" : ($.browser.safari ? "Emby for iOS" : "Emby Mobile");
var name = $.browser.android ? "Emby for Android Mobile" : ($.browser.safari ? "Emby for iOS" : "Emby Mobile");
// Remove special characters
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');