web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-07-15 01:34:23 +02:00
Code Releases Activity

fix: Conditional requestVideoFrameCallback on Safari (#7854)

Browse Source 
Safari's requestVideoFrameCallback is (intentionally?) broken when DRM is playing, so in that case use the fallback with requestAnimationFrame instead.
This commit is contained in:
mister-ben
2022-07-28 20:20:46 +02:00
committed by GitHub
parent ebe9f32f66
commit d178d9ae3c
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/js/tech/html5.js
View File

@ -745,12 +745,15 @@ class Html5 extends Tech {
/** /**
* Native requestVideoFrameCallback if supported by browser/tech, or fallback * Native requestVideoFrameCallback if supported by browser/tech, or fallback
* Don't use rVCF on Safari when DRM is playing, as it doesn't fire
* Needs to be checked later than the constructor
* This will be a false positive for clear sources loaded after a Fairplay source
* *
* @param {function} cb function to call * @param {function} cb function to call
* @return {number} id of request * @return {number} id of request
*/ */
requestVideoFrameCallback(cb) { requestVideoFrameCallback(cb) {
if (this.featuresVideoFrameCallback) { if (this.featuresVideoFrameCallback && !this.el_.webkitKeys) {
return this.el_.requestVideoFrameCallback(cb); return this.el_.requestVideoFrameCallback(cb);
} }
return super.requestVideoFrameCallback(cb); return super.requestVideoFrameCallback(cb);
@ -762,7 +765,7 @@ class Html5 extends Tech {
* @param {number} id request id to cancel * @param {number} id request id to cancel
*/ */
cancelVideoFrameCallback(id) { cancelVideoFrameCallback(id) {
if (this.featuresVideoFrameCallback) { if (this.featuresVideoFrameCallback && !this.el_.webkitKeys) {
this.el_.cancelVideoFrameCallback(id); this.el_.cancelVideoFrameCallback(id);
} else { } else {
super.cancelVideoFrameCallback(id); super.cancelVideoFrameCallback(id);

17
test/unit/tech/html5.test.js
View File

@ -1044,3 +1044,20 @@ QUnit.test('featuresVideoFrameCallback is false for audio elements', function(as
audioTech.dispose(); audioTech.dispose();
}); });
QUnit.test('featuresVideoFrameCallback is false for Safari DRM', function(assert) {
// Looking for `super.requestVideoFrameCallback()` being called
const spy = sinon.spy(Object.getPrototypeOf(Object.getPrototypeOf(tech)), 'requestVideoFrameCallback');
tech.featuresVideoFrameCallback = true;
try {
tech.el_.webkitKeys = {};
tech.requestVideoFrameCallback(function() {});
assert.ok(spy.calledOnce, false, 'rvf fallback used');
} catch (e) {
// video.webkitKeys isn't writable on Safari, so relying on the mocked property on other browsers
assert.ok(true, 'skipped because webkitKeys not writable');
}
});