From 804e7c5d0a1820e28ddea5adfc196aeedfae05b5 Mon Sep 17 00:00:00 2001
From: mister-ben <git@misterben.me>
Date: Thu, 14 Jul 2022 09:47:28 +0200
Subject: [PATCH] fix: Conditional requestVideoFrameCallback on Safari

---
 src/js/tech/html5.js         |  7 +++++--
 test/unit/tech/html5.test.js | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/js/tech/html5.js b/src/js/tech/html5.js
index ee02580daf..c2452d2c3b 100644
--- a/src/js/tech/html5.js
+++ b/src/js/tech/html5.js
@@ -745,12 +745,15 @@ class Html5 extends Tech {
 
   /**
    * 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
    * @return {number} id of request
    */
   requestVideoFrameCallback(cb) {
-    if (this.featuresVideoFrameCallback) {
+    if (this.featuresVideoFrameCallback && !this.el_.webkitKeys) {
       return this.el_.requestVideoFrameCallback(cb);
     }
     return super.requestVideoFrameCallback(cb);
@@ -762,7 +765,7 @@ class Html5 extends Tech {
    * @param {number} id request id to cancel
    */
   cancelVideoFrameCallback(id) {
-    if (this.featuresVideoFrameCallback) {
+    if (this.featuresVideoFrameCallback && !this.el_.webkitKeys) {
       this.el_.cancelVideoFrameCallback(id);
     } else {
       super.cancelVideoFrameCallback(id);
diff --git a/test/unit/tech/html5.test.js b/test/unit/tech/html5.test.js
index 309be93b74..15f2bb1ab0 100644
--- a/test/unit/tech/html5.test.js
+++ b/test/unit/tech/html5.test.js
@@ -1044,3 +1044,20 @@ QUnit.test('featuresVideoFrameCallback is false for audio elements', function(as
 
   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');
+  }
+});