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

Jump to bottom

Monkeypatch canPlayType on Android 4.0+ for HLS #1084

Merged
merged 14 commits into from
Mar 26, 2014
Merged

Monkeypatch canPlayType on Android 4.0+ for HLS #1084

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e35083b
Monkeypatch canPlayType on Android 4.0+ for HLS
gkatsev Mar 13, 2014
252ad3f
be case insensitive
gkatsev Mar 13, 2014
5381f70
+ vjs.Html5.{patchCanPlayType,unpatchCanPlayType}
gkatsev Mar 18, 2014
86c3f94
fix up jshint errors
gkatsev Mar 24, 2014
f86e073
Switch HTMLVideoElement to constructor reference
gkatsev Mar 24, 2014
817253b
Also, switch out HTMLVideoElement to constructor reference in tests
gkatsev Mar 24, 2014
0c856ce
call unpatchCanPlayType after tests
gkatsev Mar 25, 2014
f1d2aef
Don't assume only mimetype available for matching
gkatsev Mar 26, 2014
fef6282
remove unused var
gkatsev Mar 26, 2014
75bd76f
return the patched function from unpatchCanPlayType
gkatsev Mar 26, 2014
94ec725
update for IE8 and fixup stupid tests
gkatsev Mar 26, 2014
d21019a
add existence test for patch and unpatch methods
gkatsev Mar 26, 2014
e2a1cac
fix typo for unpatchCanPlayType
gkatsev Mar 26, 2014
e39557e
Always unpatch canPlayType.
gkatsev Mar 26, 2014
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
14 changes: 14 additions & 0 deletions src/js/media/html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,20 @@ vjs.Html5.disposeMediaElement = function(el){

// HTML5 Feature detection and Device Fixes --------------------------------- //

// Android 4.0 and above can play HLS to some extent but it reports being unable to do so
if (vjs.ANDROID_VERSION >= 4.0) {
(function() {
var canPlayType = HTMLVideoElement.prototype.canPlayType;

HTMLVideoElement.prototype.canPlayType = function(type) {
if (type && type === 'application/x-mpegURL' || type === 'application/vnd.apple.mpegURL') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was called out on this one... I think this should technically be a case-insensitive match.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not only that but the official mimetype is all lowercase: http://tools.ietf.org/html/draft-pantos-http-live-streaming-12#section-10

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed.

return "maybe";
}
return canPlayType.call(video.constructor.prototype, type);
}
})();
}

// Override Android 2.2 and less canPlayType method which is broken
if (vjs.IS_OLD_ANDROID) {
document.createElement('video').constructor.prototype.canPlayType = function(type){
Expand Down