From 8a32cc215f47f880773110836559f3dad29d65f6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 22 Sep 2015 23:58:29 -0400 Subject: [PATCH] fixes #1188 - Emby requires transcoding --- dashboard-ui/scripts/mediaplayer.js | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 37abbd6cc4..0cc4b94d68 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -151,13 +151,13 @@ VideoCodec: 'h264', AudioCodec: 'aac,mp3' }); - // TODO: Test this - //profile.DirectPlayProfiles.push({ - // Container: 'mov', - // Type: 'Video', - // VideoCodec: 'h264', - // AudioCodec: 'aac,mp3' - //}); + + profile.DirectPlayProfiles.push({ + Container: 'mov', + Type: 'Video', + VideoCodec: 'h264', + AudioCodec: 'aac,mp3' + }); } var directPlayVideoContainers = AppInfo.directPlayVideoContainers; @@ -311,7 +311,9 @@ Condition: 'NotEquals', Property: 'AudioProfile', Value: 'HE-AAC' - }, + } + // Disabling this is going to require us to learn why it was disabled in the first place + , { Condition: 'NotEquals', Property: 'AudioProfile', @@ -468,18 +470,18 @@ profile.ResponseProfiles = []; - profile.ResponseProfiles.push({ - Type: 'Video', - Container: 'm4v', - MimeType: 'video/mp4' - }); - //profile.ResponseProfiles.push({ // Type: 'Video', // Container: 'mkv', // MimeType: 'video/webm' //}); + profile.ResponseProfiles.push({ + Type: 'Video', + Container: 'm4v', + MimeType: 'video/mp4' + }); + profile.ResponseProfiles.push({ Type: 'Video', Container: 'mov',