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

3.0.5675.1

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-16 08:56:38 -04:00
parent 844f27d953
commit c886b12570
7 changed files with 36 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,22 +281,16 @@
profile.ContainerProfiles = [];
var audioConditions = [];
var maxAudioChannels = $.browser.msie || $.browser.safari ?
'2' :
'6';
audioConditions.push({
Condition: 'LessThanEqual',
Property: 'AudioChannels',
Value: maxAudioChannels
});
var maxAudioChannels = isVlc ? '6' : '2';
profile.CodecProfiles = [];
profile.CodecProfiles.push({
Type: 'Audio',
Conditions: audioConditions
Conditions: [{
Condition: 'LessThanEqual',
Property: 'AudioChannels',
Value: '2'
}]
});
profile.CodecProfiles.push({
@ -576,13 +570,6 @@
var playSessionId = getParameterByName('PlaySessionId', currentSrc);
var liveStreamId = getParameterByName('LiveStreamId', currentSrc);
if (params.AudioStreamIndex == null && params.SubtitleStreamIndex == null && params.Bitrate == null) {
currentSrc = replaceQueryString(currentSrc, 'starttimeticks', ticks || 0);
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, ticks);
return;
}
var deviceProfile = self.getDeviceProfile();
var audioStreamIndex = params.AudioStreamIndex == null ? (getParameterByName('AudioStreamIndex', currentSrc) || null) : params.AudioStreamIndex;
@ -600,10 +587,12 @@
if (validatePlaybackInfoResult(result)) {
self.currentMediaSource = result.MediaSources[0];
var streamInfo = self.createStreamInfo(self.currentItem.MediaType, self.currentItem, self.currentMediaSource, ticks);
self.currentSubtitleStreamIndex = subtitleStreamIndex;
currentSrc = ApiClient.getUrl(self.currentMediaSource.TranscodingUrl);
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, ticks);
currentSrc = streamInfo.url;
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, streamInfo.startTimeTicksOffset || 0);
}
});
};
@ -631,14 +620,15 @@
if (self.currentItem.MediaType == "Video") {
ApiClient.stopActiveEncodings(playSessionId).done(function () {
self.startTimeTicksOffset = newPositionTicks;
//self.startTimeTicksOffset = newPositionTicks;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
});
self.startTimeTicksOffset = newPositionTicks || 0;
self.updateTextStreamUrls(newPositionTicks || 0);
} else {
self.startTimeTicksOffset = newPositionTicks;
self.startTimeTicksOffset = newPositionTicks || 0;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
}
}