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 audio-only hls

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-24 14:33:28 -04:00
parent e396019903
commit 2e982826bb
13 changed files with 99 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@
return targets;
};
var supportsAac = document.createElement('audio').canPlayType('audio/aac').replace(/no/, '');
var canPlayAac = document.createElement('audio').canPlayType('audio/aac').replace(/no/, '');
self.getVideoQualityOptions = function (videoWidth) {
@ -153,7 +153,7 @@
Type: 'Audio'
});
if (supportsAac) {
if (canPlayAac) {
profile.DirectPlayProfiles.push({
Container: 'aac',
Type: 'Audio'
@ -173,24 +173,6 @@
profile.TranscodingProfiles = [];
if ($.browser.safari) {
profile.TranscodingProfiles.push({
Container: 'aac',
Type: 'Audio',
AudioCodec: 'aac',
Context: 'Streaming',
Protocol: 'http'
});
} else {
profile.TranscodingProfiles.push({
Container: 'mp3',
Type: 'Audio',
AudioCodec: 'mp3',
Context: 'Streaming',
Protocol: 'http'
});
}
if (self.canPlayHls()) {
profile.TranscodingProfiles.push({
Container: 'ts',
@ -200,6 +182,16 @@
Context: 'Streaming',
Protocol: 'hls'
});
if (canPlayAac) {
profile.TranscodingProfiles.push({
Container: 'aac',
Type: 'Audio',
AudioCodec: 'aac',
Context: 'Streaming',
Protocol: 'hls'
});
}
}
if (canPlayWebm) {
@ -223,6 +215,24 @@
Protocol: 'http'
});
if (canPlayAac && $.browser.safari) {
profile.TranscodingProfiles.push({
Container: 'aac',
Type: 'Audio',
AudioCodec: 'aac',
Context: 'Streaming',
Protocol: 'http'
});
} else {
profile.TranscodingProfiles.push({
Container: 'mp3',
Type: 'Audio',
AudioCodec: 'mp3',
Context: 'Streaming',
Protocol: 'http'
});
}
profile.ContainerProfiles = [];
var audioConditions = [];
@ -1685,21 +1695,6 @@
var currentTicks = self.getCurrentTicks(this);
self.setCurrentTime(currentTicks);
if ($.browser.safari) {
if (self.currentDurationTicks) {
// Seeing transcoded audio looping in safari, going past the runtime but restarting the audio
if (currentTicks > self.currentDurationTicks) {
if (currentPlaylistIndex < self.playlist.length - 1) {
self.nextTrack();
} else {
self.stop();
}
}
}
}
}
function playAudio(item, mediaSource, startPositionTicks) {