Skip to content

Commit

Permalink
Merge pull request #340 from ooyala/PLAYER-4590
Browse files Browse the repository at this point in the history
Player 4590
  • Loading branch information
dallen42 authored Oct 18, 2018
2 parents 34db5ce + 4070695 commit 6ec268a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion html5-common
6 changes: 3 additions & 3 deletions src/main/js/main_html5.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ 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
if (window.navigator.userAgent.match(/SonyCEBrowser/)) {
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);

}
}
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/main_html5/factory-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand Down

0 comments on commit 6ec268a

Please sign in to comment.