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

fixes #1188 - Emby requires transcoding

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-22 23:58:29 -04:00
parent 877aaf3573
commit 8a32cc215f
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,13 +151,13 @@
VideoCodec: 'h264', VideoCodec: 'h264',
AudioCodec: 'aac,mp3' AudioCodec: 'aac,mp3'
}); });
// TODO: Test this
//profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
// Container: 'mov', Container: 'mov',
// Type: 'Video', Type: 'Video',
// VideoCodec: 'h264', VideoCodec: 'h264',
// AudioCodec: 'aac,mp3' AudioCodec: 'aac,mp3'
//}); });
} }
var directPlayVideoContainers = AppInfo.directPlayVideoContainers; var directPlayVideoContainers = AppInfo.directPlayVideoContainers;
@ -311,7 +311,9 @@
Condition: 'NotEquals', Condition: 'NotEquals',
Property: 'AudioProfile', Property: 'AudioProfile',
Value: 'HE-AAC' Value: 'HE-AAC'
}, }
// Disabling this is going to require us to learn why it was disabled in the first place
,
{ {
Condition: 'NotEquals', Condition: 'NotEquals',
Property: 'AudioProfile', Property: 'AudioProfile',
@ -468,18 +470,18 @@
profile.ResponseProfiles = []; profile.ResponseProfiles = [];
profile.ResponseProfiles.push({
Type: 'Video',
Container: 'm4v',
MimeType: 'video/mp4'
});
//profile.ResponseProfiles.push({ //profile.ResponseProfiles.push({
// Type: 'Video', // Type: 'Video',
// Container: 'mkv', // Container: 'mkv',
// MimeType: 'video/webm' // MimeType: 'video/webm'
//}); //});
profile.ResponseProfiles.push({
Type: 'Video',
Container: 'm4v',
MimeType: 'video/mp4'
});
profile.ResponseProfiles.push({ profile.ResponseProfiles.push({
Type: 'Video', Type: 'Video',
Container: 'mov', Container: 'mov',