From e5ab8126b972de98b05d0d30fc472440b58e4c7f Mon Sep 17 00:00:00 2001 From: David Allen Date: Thu, 18 Oct 2018 13:38:59 -0700 Subject: [PATCH 1/2] changes to support audio_hls delivery type --- html5-common | 2 +- src/main/js/main_html5.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html5-common b/html5-common index fcc0d666..8d1ff58b 160000 --- a/html5-common +++ b/html5-common @@ -1 +1 @@ -Subproject commit fcc0d6665d1db6bfbca195776bd6616247dc6227 +Subproject commit 8d1ff58ba5ddea1ff1d2aab0a059f024c6fe5011 diff --git a/src/main/js/main_html5.js b/src/main/js/main_html5.js index 04452694..d43d18f3 100644 --- a/src/main/js/main_html5.js +++ b/src/main/js/main_html5.js @@ -64,7 +64,7 @@ import CONSTANTS from "./constants/constants"; list.push(OO.VIDEO.ENCODING.HLS); list.push(OO.VIDEO.ENCODING.AKAMAI_HD2_VOD_HLS); list.push(OO.VIDEO.ENCODING.AKAMAI_HD2_HLS); - list.push(OO.VIDEO.ENCODING.AUDIO_ONLY_HLS); + list.push(OO.VIDEO.ENCODING.AUDIO_HLS); } // Sony OperaTV supports HLS but doesn't properly report it so we are forcing it here @@ -72,7 +72,7 @@ import CONSTANTS from "./constants/constants"; list.push(OO.VIDEO.ENCODING.HLS); list.push(OO.VIDEO.ENCODING.AKAMAI_HD2_VOD_HLS); list.push(OO.VIDEO.ENCODING.AKAMAI_HD2_HLS); - list.push(OO.VIDEO.ENCODING.AUDIO_ONLY_HLS); + list.push(OO.VIDEO.ENCODING.AUDIO_HLS); } } @@ -334,7 +334,7 @@ import CONSTANTS from "./constants/constants"; isM3u8 = (encoding == OO.VIDEO.ENCODING.HLS || encoding == OO.VIDEO.ENCODING.AKAMAI_HD2_VOD_HLS || encoding == OO.VIDEO.ENCODING.AKAMAI_HD2_HLS || - encoding == OO.VIDEO.ENCODING.AUDIO_ONLY_HLS + encoding == OO.VIDEO.ENCODING.AUDIO_HLS ); isLive = live; urlChanged = true; From 4070695f077620bf1c554ba33f9f92c7339450ab Mon Sep 17 00:00:00 2001 From: David Allen Date: Thu, 18 Oct 2018 14:03:28 -0700 Subject: [PATCH 2/2] fix unit tests --- 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 c8eac588..5e7dc2a9 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_ONLY_HLS]); + 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]); }); it('should provide a list of supported features', function(){