Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Player 4590 #340

Merged
merged 2 commits into from
Oct 18, 2018
Merged

Player 4590 #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ab812
changes to support audio_hls delivery type
dallen42 Oct 18, 2018
4070695
fix unit tests
dallen42 Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html5-common
Open in desktop
Submodule html5-common updated 1 files
+3 −3 js/utils/constants.js
6 changes: 3 additions & 3 deletions src/main/js/main_html5.js
View file
Open in desktop
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
View file
Open in desktop
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