Skip to content

Commit

Permalink
Merge pull request #342 from ooyala/PLAYER-4720
Browse files Browse the repository at this point in the history
update constants for progressive audio types
  • Loading branch information
dallen42 authored Nov 13, 2018
2 parents 43c8e3f + 1a825c8 commit badb7a4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion html5-common
4 changes: 2 additions & 2 deletions src/main/js/main_html5.js
Original file line number Diff line number Diff line change
Expand Up @@ -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")) {
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_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(){
Expand Down

0 comments on commit badb7a4

Please sign in to comment.