From 582e695ed327627f478b1b5415859c5ee9b85e09 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 4 Jan 2016 16:13:33 -0500 Subject: [PATCH] update h264 detection --- dashboard-ui/scripts/mediaplayer.js | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 6af946a073..78d54667c1 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -1789,16 +1789,8 @@ } function canPlayH264() { - - var userAgent = navigator.userAgent.toLowerCase(); - if (userAgent.indexOf('firefox') != -1) { - if (userAgent.indexOf('windows') != -1) { - return true; - } - return false; - } - - return true; + var v = document.createElement('video'); + return !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, '')); } var supportedFormats; @@ -1818,13 +1810,7 @@ list.push('ac3'); } - var canPlayH264 = true; - var userAgent = navigator.userAgent.toLowerCase(); - if (userAgent.indexOf('firefox') != -1 && userAgent.indexOf('windows') == -1) { - canPlayH264 = false; - } - - if (canPlayH264) { + if (canPlayH264()) { list.push('h264'); }