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

update to servicestack 3.9.59

Browse source
This commit is contained in:
Luke Pulverenti 2013-09-13 21:03:55 -04:00
parent a0854c9ec6
commit eda9bca026
4 changed files with 48 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/movies.html
View file

@ -51,25 +51,25 @@
<label for="radioBudget">Budget</label> <label for="radioBudget">Budget</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating,SortName" data-mini="true">
<label for="radioCommunityRating">Community Rating</label> <label for="radioCommunityRating">Community rating</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioContentRating" value="off" data-sortby="OfficialRating,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioContentRating" value="off" data-sortby="OfficialRating,SortName" data-mini="true">
<label for="radioContentRating">Content Rating</label> <label for="radioContentRating">Content rating</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating,SortName" data-mini="true">
<label for="radioCriticRating">Critic Rating</label> <label for="radioCriticRating">Critic rating</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated,SortName" data-mini="true">
<label for="radioDateCreated">Date Added</label> <label for="radioDateCreated">Date added</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed,SortName" data-mini="true">
<label for="radioDatePlayed">Date Played</label> <label for="radioDatePlayed">Date played</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate,SortName" data-mini="true">
<label for="radioPremiereDate">Date Released</label> <label for="radioPremiereDate">Date released</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount,SortName" data-mini="true">
<label for="radioPlayCount">Play Count</label> <label for="radioPlayCount">Play count</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue,SortName" data-mini="true">
<label for="radioRevenue">Revenue</label> <label for="radioRevenue">Revenue</label>
@ -78,7 +78,7 @@
<label for="radioRuntime">Runtime</label> <label for="radioRuntime">Runtime</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
<label for="radioVideoBitRate">Video BitRate</label> <label for="radioVideoBitRate">Video Bit rate</label>
</fieldset> </fieldset>
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">

14
dashboard-ui/musicvideos.html
View file

@ -50,22 +50,22 @@
<label for="radioBudget">Budget</label> <label for="radioBudget">Budget</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
<label for="radioCommunityRating">Community Rating</label> <label for="radioCommunityRating">Community rating</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCriticRating" value="off" data-sortby="CriticRating" data-mini="true">
<label for="radioCriticRating">Critic Rating</label> <label for="radioCriticRating">Critic rating</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
<label for="radioDateCreated">Date Added</label> <label for="radioDateCreated">Date added</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
<label for="radioDatePlayed">Date Played</label> <label for="radioDatePlayed">Date played</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
<label for="radioPremiereDate">Date Released</label> <label for="radioPremiereDate">Date released</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
<label for="radioPlayCount">Play Count</label> <label for="radioPlayCount">Play count</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
<label for="radioRevenue">Revenue</label> <label for="radioRevenue">Revenue</label>
@ -74,7 +74,7 @@
<label for="radioRuntime">Runtime</label> <label for="radioRuntime">Runtime</label>
<input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true"> <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioVideoBitRate" value="off" data-sortby="VideoBitRate,SortName" data-mini="true">
<label for="radioVideoBitRate">Video BitRate</label> <label for="radioVideoBitRate">Video bit rate</label>
</fieldset> </fieldset>
<fieldset data-role="controlgroup"> <fieldset data-role="controlgroup">

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

@ -497,20 +497,28 @@
} }
} }
// Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
var prioritizeWebmOverH264 = true;
var h264Codec = 'h264';
var h264AudioCodec = 'aac';
if (videoStream.Width && videoStream.Width <= baseParams.maxWidth) {
var videoCodec = (videoStream.Codec || '').toLowerCase();
if (videoCodec.indexOf('h264') != -1) {
// h264Codec = 'copy';
}
}
if (startPosition) { if (startPosition) {
baseParams.StartTimeTicks = startPosition; baseParams.StartTimeTicks = startPosition;
} }
var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, { var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
videoCodec: 'h264', videoCodec: h264Codec,
audioCodec: 'aac', audioCodec: h264AudioCodec,
profile: 'baseline',
level: 3
}));
var tsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ts', $.extend({}, baseParams, {
videoCodec: 'h264',
audioCodec: 'aac',
profile: 'baseline', profile: 'baseline',
level: 3 level: 3
})); }));
@ -521,8 +529,8 @@
})); }));
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, { var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {
videoCodec: 'h264', videoCodec: h264Codec,
audioCodec: 'aac', audioCodec: h264AudioCodec,
profile: 'baseline', profile: 'baseline',
level: 3 level: 3
})); }));
@ -535,9 +543,6 @@
var html = ''; var html = '';
// HLS must be at the top for safari
// Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome); var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
// Can't autoplay in these browsers so we need to use the full controls // Can't autoplay in these browsers so we need to use the full controls
@ -547,10 +552,19 @@
html += '<video class="itemVideo" autoplay preload="none">'; html += '<video class="itemVideo" autoplay preload="none">';
} }
// HLS must be at the top for safari
html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />'; html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
html += '<source type="video/mp2t" src="' + tsVideoUrl + '" />';
html += '<source type="video/webm" src="' + webmVideoUrl + '" />'; if (prioritizeWebmOverH264) {
html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
} else {
html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
}
html += '<source type="video/ogg" src="' + ogvVideoUrl + '" />'; html += '<source type="video/ogg" src="' + ogvVideoUrl + '" />';
html += '</video'; html += '</video';

4
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.175" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.175" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.58" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.59" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.58" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.59" targetFramework="net45" />
</packages> </packages>