From dedfe6fd983cf2ea99d3b7473c58f5402ef39ede Mon Sep 17 00:00:00 2001 From: David Allen Date: Tue, 13 Nov 2018 16:56:47 -0600 Subject: [PATCH 1/2] update constants for progressive audio types --- html5-common | 2 +- src/main/js/main_html5.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/html5-common b/html5-common index 8d1ff58b..39231fb8 160000 --- a/html5-common +++ b/html5-common @@ -1 +1 @@ -Subproject commit 8d1ff58ba5ddea1ff1d2aab0a059f024c6fe5011 +Subproject commit 39231fb84b95863979d091a92c29c83ebe0b2d8e diff --git a/src/main/js/main_html5.js b/src/main/js/main_html5.js index 89e515ee..9d686f3e 100644 --- a/src/main/js/main_html5.js +++ b/src/main/js/main_html5.js @@ -44,11 +44,11 @@ import CONSTANTS from "./constants/constants"; } if (!!videoElement.canPlayType("audio/ogg")) { - list.push(OO.VIDEO.ENCODING.OGG); + list.push(OO.VIDEO.ENCODING.AUDIO_OGG); } if (!!videoElement.canPlayType("audio/x-m4a")) { - list.push(OO.VIDEO.ENCODING.M4A); + list.push(OO.VIDEO.ENCODING.AUDIO_M4A); } if (!!videoElement.canPlayType("video/webm")) { From 1a825c88dc9b20b18bac1c7d9ecb86e002fa3072 Mon Sep 17 00:00:00 2001 From: David Allen Date: Tue, 13 Nov 2018 17:22:00 -0600 Subject: [PATCH 2/2] repair a unit test --- tests/unit/main_html5/factory-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/main_html5/factory-tests.js b/tests/unit/main_html5/factory-tests.js index 5e7dc2a9..4ce6e3df 100644 --- a/tests/unit/main_html5/factory-tests.js +++ b/tests/unit/main_html5/factory-tests.js @@ -37,7 +37,7 @@ describe('main_html5 factory tests', function () { it('should provide a list of supported encodings', function(){ // This is controlled by document.createElement("video").canPlayType(type); - expect(pluginFactory.encodings).to.eql([OO.VIDEO.ENCODING.MP4, OO.VIDEO.ENCODING.OGG, OO.VIDEO.ENCODING.M4A, OO.VIDEO.ENCODING.WEBM, OO.VIDEO.ENCODING.HLS, OO.VIDEO.ENCODING.AKAMAI_HD2_VOD_HLS, OO.VIDEO.ENCODING.AKAMAI_HD2_HLS, OO.VIDEO.ENCODING.AUDIO_HLS]); + expect(pluginFactory.encodings).to.eql([OO.VIDEO.ENCODING.MP4, OO.VIDEO.ENCODING.AUDIO_OGG, OO.VIDEO.ENCODING.AUDIO_M4A, OO.VIDEO.ENCODING.WEBM, OO.VIDEO.ENCODING.HLS, OO.VIDEO.ENCODING.AKAMAI_HD2_VOD_HLS, OO.VIDEO.ENCODING.AKAMAI_HD2_HLS, OO.VIDEO.ENCODING.AUDIO_HLS]); }); it('should provide a list of supported features', function(){