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

initial timeshifting support

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-18 12:08:32 -04:00
parent 2971ec0e69
commit 92e4d82bd2
12 changed files with 78 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -328,8 +328,6 @@
$('.sliderValue', elem).html(tooltext);
console.log("slidin", pct, self.currentDurationTicks, time);
});
});
}

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

@ -253,7 +253,10 @@
self.duration = function (val) {
if (mediaElement) {
return mediaElement.duration;
var duration = mediaElement.duration;
if (duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY) {
return duration * 1000;
}
}
return null;

35
dashboard-ui/scripts/mediacontroller.js
View file

@ -386,31 +386,26 @@
name: Globalize.translate('ButtonNo'),
id: 'no'
});
menuItems.push({
name: Globalize.translate('ButtonCancel'),
id: 'cancel'
});
require(['actionsheet'], function (actionsheet) {
require(['dialog'], function (dialog) {
actionsheet.show({
items: menuItems,
dialog({
buttons: menuItems,
//positionTo: positionTo,
title: Globalize.translate('ConfirmEndPlayerSession'),
callback: function (id) {
text: Globalize.translate('ConfirmEndPlayerSession')
switch (id) {
}).then(function (id) {
switch (id) {
case 'yes':
MediaController.getCurrentPlayer().endSession();
self.setDefaultPlayerActive();
break;
case 'no':
self.setDefaultPlayerActive();
break;
default:
break;
}
case 'yes':
MediaController.getCurrentPlayer().endSession();
self.setDefaultPlayerActive();
break;
case 'no':
self.setDefaultPlayerActive();
break;
default:
break;
}
});

20
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -595,24 +595,11 @@
return html;
}
function getSeekableDuration() {
if (self.currentMediaSource && self.currentMediaSource.RunTimeTicks) {
return self.currentMediaSource.RunTimeTicks;
}
if (self.currentMediaRenderer) {
return self.getCurrentTicks(self.currentMediaRenderer);
}
return null;
}
function onPositionSliderChange() {
var newPercent = parseFloat(this.value);
var newPositionTicks = (newPercent / 100) * getSeekableDuration();
var newPositionTicks = (newPercent / 100) * self.getSeekableDurationTicks();
self.changeStream(Math.floor(newPositionTicks));
}
@ -808,7 +795,7 @@
positionSlider.getBubbleText = function (value) {
var seekableDuration = getSeekableDuration();
var seekableDuration = self.getSeekableDurationTicks();
if (!self.currentMediaSource || !seekableDuration) {
return '--:--';
}
@ -1016,7 +1003,7 @@
// Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts
// This will start the transcoding process before actually feeding the video url into the player
// Edit: Also seeing stalls from hls.js
if (!mediaSource.RunTimeTicks && isHls) {
if (!mediaSource.RunTimeTicks && isHls && !browserInfo.edge) {
Dashboard.showLoadingMsg();
var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8');
@ -1170,7 +1157,6 @@
document.body.classList.add('bodyWithPopupOpen');
self.currentMediaRenderer = mediaRenderer;
self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
self.updateNowPlayingInfo(item);

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

@ -11,7 +11,6 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
self.currentItem = null;
self.currentMediaSource = null;
self.currentDurationTicks = null;
self.startTimeTicksOffset = null;
self.playlist = [];
@ -146,7 +145,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
// viblast can help us here
//return true;
return window.MediaSource && !browserInfo.firefox;
return window.MediaSource;
};
self.changeStream = function (ticks, params) {
@ -166,7 +165,13 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
Dashboard.getDeviceProfile().then(function (deviceProfile) {
Dashboard.getDeviceProfile(null, {
enableMkvProgressive: self.currentMediaSource.RunTimeTicks != null,
enableTsProgressive: self.currentMediaSource.RunTimeTicks != null,
enableHls: !browserInfo.firefox || self.currentMediaSource.RunTimeTicks == null
}).then(function (deviceProfile) {
var audioStreamIndex = params.AudioStreamIndex == null ? (getParameterByName('AudioStreamIndex', currentSrc) || null) : params.AudioStreamIndex;
if (typeof (audioStreamIndex) == 'string') {
@ -264,6 +269,22 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
//self.updateTextStreamUrls(streamInfo.startTimeTicksOffset || 0);
};
self.getSeekableDurationTicks = function () {
if (self.currentMediaSource && self.currentMediaSource.RunTimeTicks) {
return self.currentMediaSource.RunTimeTicks;
}
if (self.currentMediaRenderer) {
var duration = self.currentMediaRenderer.duration();
if (duration) {
return duration * 10000;
}
}
return null;
};
self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
// Convert to ticks
@ -272,13 +293,15 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
var timeText = datetime.getDisplayRunningTime(ticks);
var mediaRenderer = self.currentMediaRenderer;
if (self.currentDurationTicks) {
var seekableDurationTicks = self.getSeekableDurationTicks();
timeText += " / " + datetime.getDisplayRunningTime(self.currentDurationTicks);
if (seekableDurationTicks) {
timeText += " / " + datetime.getDisplayRunningTime(seekableDurationTicks);
if (positionSlider) {
var percent = ticks / self.currentDurationTicks;
var percent = ticks / seekableDurationTicks;
percent *= 100;
positionSlider.value = percent;
@ -287,7 +310,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
if (positionSlider) {
positionSlider.disabled = !((self.currentDurationTicks || 0) > 0 || canPlayerSeek());
positionSlider.disabled = !((seekableDurationTicks || 0) > 0 || canPlayerSeek());
}
if (currentTimeElement) {
@ -655,7 +678,13 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
}
var onBitrateDetected = function () {
Dashboard.getDeviceProfile().then(function (deviceProfile) {
Dashboard.getDeviceProfile(null, {
enableMkvProgressive: item.RunTimeTicks != null,
enableTsProgressive: item.RunTimeTicks != null,
enableHls: !browserInfo.firefox || item.RunTimeTicks == null
}).then(function (deviceProfile) {
playOnDeviceProfileCreated(deviceProfile, item, startPosition, callback);
});
};
@ -1516,7 +1545,6 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
Events.on(mediaRenderer, "timeupdate", onTimeUpdate);
self.currentMediaRenderer = mediaRenderer;
self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
mediaRenderer.init().then(function () {

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

@ -670,7 +670,7 @@ var Dashboard = {
});
},
getDeviceProfile: function (maxHeight) {
getDeviceProfile: function (maxHeight, profileOptions) {
return new Promise(function (resolve, reject) {
@ -838,9 +838,9 @@ var Dashboard = {
supportsCustomSeeking = true;
}
var profile = profileBuilder({
var profile = profileBuilder(Object.assign(profileOptions || {}, {
supportsCustomSeeking: supportsCustomSeeking
});
}));
if (!(AppInfo.isNativeApp && browserInfo.android) && !browserInfo.edge && !browserInfo.msie) {
// libjass not working here