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

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);