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

fix xbox one browser access

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-06 23:11:51 -04:00
parent 0a24cd2dc6
commit 173773d5bc
22 changed files with 1229 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@
self.getTargets = function () {
var targets = [{
name: 'My Browser',
name: Globalize.translate('MyDevice'),
id: ConnectionManager.deviceId(),
playerName: self.name,
playableMediaTypes: ['Audio', 'Video'],
@ -139,6 +139,13 @@
VideoCodec: 'h264',
AudioCodec: 'aac,mp3'
});
// TODO: Test this
//profile.DirectPlayProfiles.push({
// Container: 'mov',
// Type: 'Video',
// VideoCodec: 'h264',
// AudioCodec: 'aac,mp3'
//});
}
profile.DirectPlayProfiles.push({
@ -208,7 +215,6 @@
profile.ContainerProfiles = [];
var audioConditions = [];
var videoAudioAacConditions = [];
var videoAudioMp3Conditions = [];
var maxAudioChannels = $.browser.msie || $.browser.safari ?
@ -222,7 +228,6 @@
};
audioConditions.push(channelCondition);
videoAudioAacConditions.push(channelCondition);
videoAudioMp3Conditions.push(channelCondition);
profile.CodecProfiles = [];
@ -239,22 +244,32 @@
});
}
videoAudioAacConditions.push({
Condition: 'NotEquals',
Property: 'AudioProfile',
Value: 'LC'
});
videoAudioAacConditions.push({
Condition: 'NotEquals',
Property: 'AudioProfile',
Value: 'HE-AAC'
profile.CodecProfiles.push({
Type: 'VideoAudio',
Codec: 'aac',
Container: 'mkv,mov',
Conditions: [
channelCondition,
{
Condition: 'NotEquals',
Property: 'AudioProfile',
Value: 'HE-AAC'
},
{
Condition: 'NotEquals',
Property: 'AudioProfile',
Value: 'LC'
}
]
});
profile.CodecProfiles.push({
Type: 'VideoAudio',
Codec: 'aac',
Conditions: videoAudioAacConditions
Container: 'mp4,m4v',
Conditions: [
channelCondition
]
});
profile.CodecProfiles.push({
@ -319,6 +334,18 @@
MimeType: 'video/mp4'
});
//profile.ResponseProfiles.push({
// Type: 'Video',
// Container: 'mkv',
// MimeType: 'video/webm'
//});
profile.ResponseProfiles.push({
Type: 'Video',
Container: 'mov',
MimeType: 'video/webm'
});
return profile;
};
@ -833,7 +860,10 @@
var deviceProfile = self.getDeviceProfile();
Dashboard.showLoadingMsg();
if (item.MediaType === "Video") {
Dashboard.showModalLoadingMsg();
}
getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) {
@ -856,7 +886,7 @@
playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
}
} else {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
showPlaybackInfoErrorMessage('NoCompatibleStream');
}
}
@ -866,7 +896,7 @@
function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
Dashboard.hideLoadingMsg();
Dashboard.hideModalLoadingMsg();
self.currentMediaSource = mediaSource;
self.currentItem = item;