cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

rework text subtitles

Browse Source
This commit is contained in:
Luke Pulverenti 2014-01-10 08:52:01 -05:00
parent 1447aafd24
commit 8ef09d054d
11 changed files with 300 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApiClient.js
View File

@ -436,13 +436,26 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
self.getLiveTvPrograms = function (options) {
var url = self.getUrl("LiveTv/Programs", options || {});
options = options || {};
if (options.channelIds) {
return self.ajax({
type: "POST",
url: self.getUrl("LiveTv/Programs"),
data: JSON.stringify(options),
contentType: "application/json",
dataType: "json"
});
} else {
return self.ajax({
type: "GET",
url: url,
url: self.getUrl("LiveTv/Programs", options),
dataType: "json"
});
}
};
self.getLiveTvRecordings = function (options) {

22
dashboard-ui/css/livetv.css
View File

@ -133,12 +133,12 @@
.channelTimeslotHeader {
position: absolute;
left: 0;
left: 15px;
}
.timeslotHeaders {
position: absolute;
right: 13px;
right: 28px;
overflow-y: hidden;
overflow-x: hidden;
white-space: nowrap;
@ -205,14 +205,14 @@
overflow-y: hidden;
overflow-x: hidden;
position: absolute;
left: 0;
bottom: 16px;
left: 15px;
bottom: 46px;
}
.programGrid {
position: absolute;
bottom: 0;
right: 0;
bottom: 30px;
right: 15px;
overflow-y: scroll;
overflow-x: scroll;
}
@ -242,15 +242,15 @@
}
.timeslotHeaders, .programGrid {
left: 191px;
left: 206px;
}
.channelTimeslotHeader, .timeslotHeaders {
top: 135px;
top: 150px;
}
.channelList, .programGrid {
top: 165px;
top: 180px;
}
.channelHeaderCell, .timeslotCell {
@ -305,10 +305,10 @@
@media (max-width: 750px) {
.channelTimeslotHeader, .timeslotHeaders {
top: 100px;
top: 115px;
}
.channelList, .programGrid {
top: 130px;
top: 145px;
}
}

8
dashboard-ui/encodingsettings.html
View File

@ -17,15 +17,15 @@
<form class="encodingSettingsForm">
<fieldset data-role="controlgroup">
<legend>Transcoding Quality:</legend>
<legend>Transcoding Quality Preference:</legend>
<input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioAuto" value="Auto">
<label for="radioAuto">Auto<br /><span style="font-weight:normal;">The server will decide quality and speed</span></label>
<input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighSpeed" value="HighSpeed">
<label for="radioHighSpeed">Prefer higher speed<br /><span style="font-weight:normal;">Lower quality, but faster encoding</span></label>
<label for="radioHighSpeed">Higher speed<br /><span style="font-weight:normal;">Lower quality, but faster encoding</span></label>
<input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighQuality" value="HighQuality">
<label for="radioHighQuality">Prefer higher quality<br /><span style="font-weight:normal;">Higher quality, but slower encoding</span></label>
<label for="radioHighQuality">Higher quality<br /><span style="font-weight:normal;">Higher quality, but slower encoding</span></label>
<input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioMaxQuality" value="MaxQuality">
<label for="radioMaxQuality">Perfer max quality<br /><span style="font-weight:normal;">Best quality with slower encoding and high CPU usage</span></label>
<label for="radioMaxQuality">Max quality<br /><span style="font-weight:normal;">Best quality with slower encoding and high CPU usage</span></label>
</fieldset>
<br />

3
dashboard-ui/itemdetails.html
View File

@ -141,6 +141,9 @@
<span id="playButtonContainer" style="display: none;">
<button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
</span>
<span id="trailerButtonContainer">
<button id="btnPlayTrailer" type="button" data-icon="play" data-inline="true" data-mini="true">Trailer</button>
</span>
<span id="playExternalButtonContainer" style="display: none;">
<a id="btnPlayExternal" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">Play</a>
</span>

7
dashboard-ui/livetvguide.html
View File

@ -16,10 +16,15 @@
<div data-role="content" style="padding-top: 5px;">
<div>
<div>
<div style="text-align: center;">
<select id="selectDate" data-mini="true" data-icon="calendar" data-inline="true">
<option>Today</option>
</select>
<div style="display: inline-block; vertical-align: middle;">
Channels
</div>
<div style="display: inline-block; vertical-align: middle;" class="channelPaging">
</div>
</div>
<div>

26
dashboard-ui/scripts/itemdetailpage.js
View File

@ -84,6 +84,12 @@
$('#playExternalButtonContainer', page).hide();
}
if (item.LocalTrailerCount && item.LocationType !== "Offline") {
$('#trailerButtonContainer', page).show();
} else {
$('#trailerButtonContainer', page).hide();
}
$(".autoNumeric").autoNumeric('init');
setPeopleHeader(page, item);
@ -189,7 +195,7 @@
$('#scenesCollapsible', page).show();
renderScenes(page, item, 4);
}
if (!item.LocalTrailerCount && !item.RemoteTrailers.length) {
if (item.LocalTrailerCount || !item.RemoteTrailers.length) {
$('#trailersCollapsible', page).addClass('hide');
} else {
$('#trailersCollapsible', page).removeClass('hide');
@ -1120,6 +1126,24 @@
LibraryBrowser.showPlayMenu(this, currentItem.Id, currentItem.Type, mediaType, userdata.PlaybackPositionTicks);
});
$('#btnPlayTrailer', page).on('click', function () {
ApiClient.getLocalTrailers(Dashboard.getCurrentUserId(), currentItem.Id).done(function (trailers) {
var trailer = trailers[0];
var userdata = trailer.UserData || {};
var mediaType = trailer.MediaType;
if (trailer.Type == "MusicArtist" || trailer.Type == "MusicAlbum") {
mediaType = "Audio";
}
LibraryBrowser.showPlayMenu(this, trailer.Id, trailer.Type, mediaType, userdata.PlaybackPositionTicks);
});
});
$('#btnPlayExternal', page).on('click', function () {
ApiClient.markPlayed(Dashboard.getCurrentUserId(), currentItem.Id, new Date());

14
dashboard-ui/scripts/librarybrowser.js
View File

@ -1417,7 +1417,7 @@
return html;
},
getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting) {
getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes) {
if (query.Limit && updatePageSizeSetting !== false) {
localStorage.setItem('pagesize', query.Limit);
@ -1477,13 +1477,11 @@
}
}
options += getOption(20);
options += getOption(50);
options += getOption(100);
options += getOption(200);
options += getOption(300);
options += getOption(400);
options += getOption(500);
pageSizes = pageSizes || [20, 50, 100, 200, 300, 400, 500];
for (var j = 0, length = pageSizes.length; j < length; j++) {
options += getOption(pageSizes[j]);
}
// Add styles to defeat jquery mobile
html += '<label style="display:inline;font-size:inherit;" class="labelPageSize" for="' + id + '">Limit: </label><select class="selectPageSize" id="' + id + '" data-enhance="false" data-role="none">' + options + '</select>';

60
dashboard-ui/scripts/livetvchannels.js
View File

@ -1,5 +1,10 @@
(function ($, document, apiClient) {
var query = {
StartIndex: 0
};
function getChannelsHtml(channels) {
return LibraryBrowser.getPosterViewHtml({
@ -10,23 +15,64 @@
});
}
function renderChannels(page, channels) {
function renderChannels(page, result) {
$('#items', page).html(getChannelsHtml(channels)).trigger('create');
$('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
var html = getChannelsHtml(result.Items);
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
$('#items', page).html(html).trigger('create');
$('.selectPage', page).on('change', function () {
query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
reloadItems(page);
});
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page);
});
$('.selectPageSize', page).on('change', function () {
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
});
LibraryBrowser.saveQueryValues('movies', query);
}
function reloadItems(page) {
apiClient.getLiveTvChannels(query).done(function (result) {
renderChannels(page, result);
});
}
$(document).on('pagebeforeshow', "#liveTvChannelsPage", function () {
var page = this;
apiClient.getLiveTvChannels({
var limit = LibraryBrowser.getDefaultPageSize();
userId: Dashboard.getCurrentUserId()
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
}).done(function (result) {
query.UserId = Dashboard.getCurrentUserId();
renderChannels(page, result.Items);
});
LibraryBrowser.loadSavedQueryValues('movies', query);
reloadItems(page);
});
})(jQuery, document, ApiClient);

57
dashboard-ui/scripts/livetvguide.js
View File

@ -8,6 +8,12 @@
var gridLocalEndDateMs;
var currentDate;
var channelQuery = {
StartIndex: 0,
Limit: 20
};
var channelsPromise;
function normalizeDateToTimeslot(date) {
@ -26,15 +32,18 @@
return date;
}
function reloadChannels(page) {
channelsPromise = null;
reloadGuide(page);
}
function reloadGuide(page) {
Dashboard.showLoadingMsg();
channelsPromise = channelsPromise || apiClient.getLiveTvChannels({
channelQuery.userId = Dashboard.getCurrentUserId();
userId: Dashboard.getCurrentUserId()
});;
channelsPromise = channelsPromise || apiClient.getLiveTvChannels(channelQuery);
var date = currentDate;
@ -42,23 +51,45 @@
nextDay.setHours(0, 0, 0, 0);
nextDay.setDate(nextDay.getDate() + 1);
var promise1 = channelsPromise;
var promise2 = apiClient.getLiveTvPrograms({
channelsPromise.done(function(channelsResult) {
apiClient.getLiveTvPrograms({
UserId: Dashboard.getCurrentUserId(),
MaxStartDate: nextDay.toISOString(),
MinEndDate: date.toISOString()
MinEndDate: date.toISOString(),
channelIds: channelsResult.Items.map(function(c) {
return c.Id;
}).join(',')
}).done(function(programsResult) {
renderGuide(page, date, channelsResult.Items, programsResult.Items);
Dashboard.hideLoadingMsg();
});
$.when(promise1, promise2).done(function (response1, response2) {
var channelPagingHtml = LibraryBrowser.getPagingHtml(channelQuery, channelsResult.TotalRecordCount, false, [10, 20, 30, 50, 100]);
$('.channelPaging', page).html(channelPagingHtml).trigger('create');
var channels = response1[0].Items;
var programs = response2[0].Items;
$('.selectPage', page).on('change', function () {
channelQuery.StartIndex = (parseInt(this.value) - 1) * channelQuery.Limit;
reloadChannels(page);
});
renderGuide(page, date, channels, programs);
$('.btnNextPage', page).on('click', function () {
channelQuery.StartIndex += channelQuery.Limit;
reloadChannels(page);
});
Dashboard.hideLoadingMsg();
$('.btnPreviousPage', page).on('click', function () {
channelQuery.StartIndex -= channelQuery.Limit;
reloadChannels(page);
});
$('.selectPageSize', page).on('change', function () {
channelQuery.Limit = parseInt(this.value);
channelQuery.StartIndex = 0;
reloadChannels(page);
});
});
}
@ -394,7 +425,7 @@
onProgramGridScroll(page, this);
});
$('#selectDate', page).on('change', function() {
$('#selectDate', page).on('change', function () {
var date = new Date();
date.setTime(parseInt(this.value));

190
dashboard-ui/scripts/mediaplayer.js
View File

@ -17,7 +17,7 @@
var unmuteButton;
var startTimeTicksOffset;
var curentDurationTicks;
var isStaticStream;
var canClientSeek;
var culturesPromise;
var timeout;
var idleState = true;
@ -28,6 +28,11 @@
var channelsListPromise;
var channelsListPromiseTime;
function updateCanClientSeek(elem) {
var duration = elem.duration;
canClientSeek = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
}
function getChannelsListPromise() {
var lastUpdateTime = channelsListPromiseTime || 0;
@ -182,7 +187,8 @@
var media = testableVideoElement;
// safari
if (media.canPlayType('application/x-mpegURL').replace(/no/, '')) {
if (media.canPlayType('application/x-mpegURL').replace(/no/, '') ||
media.canPlayType('application/vnd.apple.mpegURL').replace(/no/, '')) {
return '.m3u8';
}
@ -198,7 +204,7 @@
var element = currentMediaElement;
if (isStaticStream && params == null) {
if (canClientSeek && params == null) {
element.currentTime = ticks / (1000 * 10000);
@ -207,7 +213,6 @@
params = params || {};
var currentSrc = element.currentSrc;
console.log(currentSrc);
currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks);
if (params.AudioStreamIndex != null) {
@ -246,6 +251,8 @@
$(element).off('ended.playbackstopped').off('ended.playnext').on("play.onceafterseek", function () {
updateCanClientSeek(this);
$(this).off('play.onceafterseek').on('ended.playbackstopped', onPlaybackStopped).on('ended.playnext', playNextAfterEnded);
startProgressInterval(currentItem.Id);
@ -256,7 +263,6 @@
ApiClient.stopActiveEncodings().done(function () {
startTimeTicksOffset = ticks;
element.src = currentSrc;
});
}
@ -333,22 +339,20 @@
var videoBitrate = parseInt(this.getAttribute('data-videobitrate'));
var audioBitrate = parseInt(this.getAttribute('data-audiobitrate'));
var mp4AudioCodec = this.getAttribute('data-mp4audio');
var mp4VideoCodec = this.getAttribute('data-mp4video');
var audioCodec = this.getAttribute('data-audiocodec');
var videoCodec = this.getAttribute('data-videocodec');
var isStatic = this.getAttribute('data-static');
localStorage.setItem('preferredVideoBitrate', videoBitrate + audioBitrate);
var isMp4 = currentMediaElement.currentSrc.toLowerCase().indexOf('.mp4') != -1;
changeStream(getCurrentTicks(), {
MaxWidth: maxWidth,
VideoBitrate: videoBitrate,
AudioBitrate: audioBitrate,
Static: isStatic,
AudioCodec: isMp4 ? mp4AudioCodec : null,
VideoCodec: isMp4 ? mp4VideoCodec : null
AudioCodec: audioCodec,
VideoCodec: videoCodec
});
}
@ -399,15 +403,16 @@
currentTimeElement.html(timeText);
}
function playAudio(item, params) {
function playAudio(item, startPositionTicks) {
startPositionTicks = startPositionTicks || 0;
var baseParams = {
audioChannels: 2,
audioBitrate: 128000
audioBitrate: 128000,
StartTimeTicks: startPositionTicks
};
$.extend(baseParams, params);
var mp3Url = ApiClient.getUrl('Audio/' + item.Id + '/stream.mp3', $.extend({}, baseParams, {
audioCodec: 'mp3'
}));
@ -422,6 +427,9 @@
var mediaStreams = item.MediaStreams || [];
var isStatic = false;
var seekParam = isStatic && startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
for (var i = 0, length = mediaStreams.length; i < length; i++) {
var stream = mediaStreams[i];
@ -430,16 +438,19 @@
// Stream statically when possible
if (endsWith(item.Path, ".aac") && stream.BitRate <= 256000) {
aacUrl += "&static=true";
aacUrl += "&static=true" + seekParam;
isStatic = true;
}
else if (endsWith(item.Path, ".mp3") && stream.BitRate <= 256000) {
mp3Url += "&static=true";
mp3Url += "&static=true" + seekParam;
isStatic = true;
}
break;
}
}
startTimeTicksOffset = isStatic ? 0 : startPositionTicks;
var html = '';
var requiresControls = $.browser.android || ($.browser.webkit && !$.browser.chrome);
@ -498,8 +509,7 @@
audioElement.hide();
}
var duration = this.duration;
isStaticStream = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
updateCanClientSeek(this);
audioElement.off("play.once");
@ -549,7 +559,11 @@
return false;
}
var extension = item.Path.substring(item.Path.lastIndexOf('.') + 1);
var extension = item.Path.substring(item.Path.lastIndexOf('.') + 1).toLowerCase();
if (extension == 'm4v') {
return $.browser.chrome;
}
return extension.toLowerCase() == 'mp4';
}
@ -575,7 +589,7 @@
return true;
}
function getVideoQualityOptions(item, audioStreamIndex) {
function getVideoQualityOptions(item, audioStreamIndex, transcodeExtension) {
var videoStream = (item.MediaStreams || []).filter(function (stream) {
return stream.Type == "Video";
@ -600,6 +614,13 @@
maxAllowedWidth = videoStream.Width;
}
var canPlayVideoCodecDirect = (videoStream ? videoStream.Codec : '').toLowerCase().indexOf('h264') != -1;
var canPlayAudioDirect = audioStream ? canPlayAudioStreamDirect(audioStream) : false;
var videoBitrate = videoStream ? videoStream.BitRate : null;
var audioBitrate = audioStream ? audioStream.BitRate : null;
var totalBitrate = (videoBitrate || 0) + (audioBitrate || 0);
// Some 1080- videos are reported as 1912?
if (maxAllowedWidth >= 1910) {
options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
@ -630,13 +651,6 @@
options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
var canPlayVideoCodecDirect = (videoStream ? videoStream.Codec : '').toLowerCase().indexOf('h264') != -1;
var canPlayAudioDirect = audioStream ? canPlayAudioStreamDirect(audioStream) : false;
var videoBitrate = videoStream ? videoStream.BitRate : null;
var audioBitrate = audioStream ? audioStream.BitRate : null;
var totalBitrate = (videoBitrate || 0) + (audioBitrate || 0);
var videoWidth = videoStream ? videoStream.Width : null;
var i, length, option;
@ -660,15 +674,18 @@
if (canPlayDirect) {
option.isStatic = true;
option.mp4VideoCodec = 'copy';
option.mp4AudioCodec = 'copy';
option.videoCodec = 'copy';
option.audioCodec = 'copy';
}
//else if (canPlayVideoCodecDirect && transcodeExtension == '.m3u8') {
// option.videoCodec = 'copy';
//}
}
option.isStatic = option.isStatic || false;
option.mp4VideoCodec = option.mp4VideoCodec || 'h264';
option.mp4AudioCodec = option.mp4AudioCodec || 'aac';
option.videoCodec = option.videoCodec || (transcodeExtension == '.webm' ? 'vpx' : 'h264');
option.audioCodec = option.audioCodec || (transcodeExtension == '.webm' ? 'Vorbis' : 'aac');
option.videoBitrate = option.bitrate - option.audioBitrate;
}
@ -703,39 +720,60 @@
Static: false
};
var qualityOption = getVideoQualityOptions(item, baseParams.AudioStreamIndex).filter(function (opt) {
var mp4Quality = getVideoQualityOptions(item, baseParams.AudioStreamIndex, '.mp4').filter(function (opt) {
return opt.selected;
})[0];
baseParams.maxWidth = qualityOption.maxWidth;
baseParams.videoBitrate = qualityOption.videoBitrate;
baseParams.audioBitrate = qualityOption.audioBitrate;
var webmQuality = getVideoQualityOptions(item, baseParams.AudioStreamIndex, '.webm').filter(function (opt) {
return opt.selected;
})[0];
var m3U8Quality = getVideoQualityOptions(item, baseParams.AudioStreamIndex, '.m3u8').filter(function (opt) {
return opt.selected;
})[0];
// Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
var prioritizeWebmOverH264 = $.browser.chrome || $.browser.msie;
var staticMp4 = qualityOption.isStatic;
var isStatic = mp4Quality.isStatic;
startTimeTicksOffset = isStatic ? 0 : startPosition || 0;
var seekParam = isStatic && startPosition ? '#t=' + (startPosition / 10000000) : '';
var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
VideoCodec: qualityOption.mp4VideoCodec,
AudioCodec: qualityOption.mp4AudioCodec,
profile: 'baseline',
level: 3,
Static: staticMp4
}));
Static: isStatic,
maxWidth: mp4Quality.maxWidth,
videoBitrate: mp4Quality.videoBitrate,
audioBitrate: mp4Quality.audioBitrate,
VideoCodec: mp4Quality.videoCodec,
AudioCodec: mp4Quality.audioCodec
})) + seekParam;
var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
VideoCodec: 'vpx',
AudioCodec: 'Vorbis'
}));
AudioCodec: 'Vorbis',
maxWidth: webmQuality.maxWidth,
videoBitrate: webmQuality.videoBitrate,
audioBitrate: webmQuality.audioBitrate
})) + seekParam;
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.m3u8', $.extend({}, baseParams, {
VideoCodec: qualityOption.mp4VideoCodec,
AudioCodec: qualityOption.mp4AudioCodec,
profile: 'baseline',
level: 3,
timeStampOffsetMs: 0
}));
timeStampOffsetMs: 0,
maxWidth: m3U8Quality.maxWidth,
videoBitrate: m3U8Quality.videoBitrate,
audioBitrate: m3U8Quality.audioBitrate,
VideoCodec: m3U8Quality.videoCodec,
AudioCodec: m3U8Quality.audioCodec
})) + seekParam;
var html = '';
@ -748,19 +786,19 @@
html += '<video class="itemVideo" autoplay preload="none">';
}
if (!staticMp4) {
if (!isStatic) {
// HLS must be at the top for safari
html += '<source type="application/x-mpegURL" src="' + hlsVideoUrl + '" />';
}
if (prioritizeWebmOverH264 && !staticMp4) {
if (prioritizeWebmOverH264 && !isStatic) {
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
}
html += '<source type="video/mp4" src="' + mp4VideoUrl + '" />';
if (!prioritizeWebmOverH264 && !staticMp4) {
if (!prioritizeWebmOverH264 && !isStatic) {
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
}
@ -830,15 +868,10 @@
}).on("play.once", function () {
var duration = this.duration;
isStaticStream = duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY;
updateCanClientSeek(this);
videoElement.off("play.once");
if (startPosition && staticMp4) {
self.seek(startPosition);
}
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id, true, item.MediaType);
startProgressInterval(item.Id);
@ -993,26 +1026,12 @@
self.canPlayMediaType = function (mediaType) {
var media;
if (mediaType === "Video") {
media = testableVideoElement;
if (media.canPlayType) {
return media.canPlayType('video/mp4').replace(/no/, '') || media.canPlayType('video/mp2t').replace(/no/, '') || media.canPlayType('video/webm').replace(/no/, '') || media.canPlayType('application/x-mpegURL').replace(/no/, '') || media.canPlayType('video/ogv').replace(/no/, '');
}
return false;
return true;
}
if (mediaType === "Audio") {
media = testableAudioElement;
if (media.canPlayType) {
return media.canPlayType('audio/mpeg').replace(/no/, '') || media.canPlayType('audio/webm').replace(/no/, '') || media.canPlayType('audio/aac').replace(/no/, '');
}
return false;
return true;
}
return false;
@ -1116,13 +1135,11 @@
mediaElement = playVideo(item, startPosition, user);
} else if (item.MediaType === "Audio") {
mediaElement = playAudio(item);
mediaElement = playAudio(item, startPosition);
} else {
throw new Error("Unrecognized media type");
}
startTimeTicksOffset = startPosition || 0;
currentMediaElement = mediaElement;
var nowPlayingBar = $('#nowPlayingBar').show();
@ -1834,9 +1851,26 @@
var html = '';
var currentSrc = currentMediaElement.currentSrc.toLowerCase();
var isStatic = currentSrc.indexOf('static=true') != -1;
var transcodingExtension = isStatic ? getTranscodingExtension() : null;
if (!transcodingExtension) {
if (currentSrc.indexOf('.m3u8') != -1) {
transcodingExtension = '.m3u8';
}
else if (currentSrc.indexOf('.webm') != -1) {
transcodingExtension = '.webm';
}
else {
transcodingExtension = '.mp4';
}
}
var currentAudioStreamIndex = getParameterByName('AudioStreamIndex', currentMediaElement.currentSrc);
var options = getVideoQualityOptions(item, currentAudioStreamIndex);
var options = getVideoQualityOptions(item, currentAudioStreamIndex, transcodingExtension);
for (var i = 0, length = options.length; i < length; i++) {
@ -1848,7 +1882,7 @@
cssClass += " selectedMediaFlyoutOption";
}
html += '<div data-static="' + option.isStatic + '" data-mp4video="' + option.mp4VideoCodec + '" data-mp4audio="' + option.mp4AudioCodec + '" data-maxwidth="' + option.maxWidth + '" data-videobitrate="' + option.videoBitrate + '" data-audiobitrate="' + option.audioBitrate + '" class="' + cssClass + '">';
html += '<div data-static="' + option.isStatic + '" data-videocodec="' + option.videoCodec + '" data-audiocodec="' + option.audioCodec + '" data-maxwidth="' + option.maxWidth + '" data-videobitrate="' + option.videoBitrate + '" data-audiobitrate="' + option.audioBitrate + '" class="' + cssClass + '">';
html += '<div class="mediaFlyoutOptionContent">';

2
packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.219" targetFramework="net45" />
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.223" targetFramework="net45" />
</packages>