FairPlay DRM updates

demo/main.js

@@ -1738,7 +1738,7 @@ shakaDemo.Main = class {
 shakaDemo.Main.commonDrmSystems = [
   'com.widevine.alpha',
   'com.microsoft.playready',
-  'com.apple.fps.1_0',
+  'com.apple.fps',
   'com.adobe.primetime',
   'org.w3.clearkey',
 ];

lib/media/drm_engine.js

@@ -591,6 +591,17 @@ shaka.media.DrmEngine = class {
     return false;
   }
 
+  /**
+   * @param {?string} keySystem
+   * @return {boolean} */
+  static isFairPlayKeySystem(keySystem) {
+    if (keySystem) {
+      return !!keySystem.match(/^com\.apple\.fps/);
+    }
+
+    return false;
+  }
+
   /**
    * Check if DrmEngine (as initialized) will likely be able to support the
    * given content type.
@@ -800,6 +811,14 @@ shaka.media.DrmEngine = class {
             config.sessionTypes = [info.sessionType];
           }
 
+          // FairPlay does not support distinctiveIdentifier, persistentState
+          // and also only supports temporary sessions.
+          if (shaka.media.DrmEngine.isFairPlayKeySystem(info.keySystem)) {
+            config.distinctiveIdentifier = 'not-allowed';
+            config.persistentState = 'not-allowed';
+            config.sessionTypes = ['temporary'];
+          }
+
           const robustness = (stream.type == ContentType.AUDIO) ?
               info.audioRobustness : info.videoRobustness;
 
@@ -1631,9 +1650,6 @@ shaka.media.DrmEngine = class {
       'com.widevine.alpha',
       'com.microsoft.playready',
       'com.microsoft.playready.recommendation',
-      'com.apple.fps.3_0',
-      'com.apple.fps.2_0',
-      'com.apple.fps.1_0',
       'com.apple.fps',
       'com.adobe.primetime',
     ];

lib/player.js

@@ -2017,7 +2017,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         originalId: null,
         createSegmentIndex: () => Promise.resolve(),
         segmentIndex: null,
-        mimeType: 'video/mp4',
+        mimeType: 'application/vnd.apple.mpegurl',
         codecs: '',
         encrypted: true,
         drmInfos: [],  // Filled in by DrmEngine config.

lib/polyfill/patchedmediakeys_apple.js

@@ -33,19 +33,12 @@ shaka.polyfill.PatchedMediaKeysApple = class {
       return;
     }
 
-    /* Unprefixed EME disabled.  See:
-       https://github.com/google/shaka-player/pull/3021#issuecomment-766999811
-
-    // Only tested in Safari 14.
-    const safariVersion = shaka.util.Platform.safariVersion();
     if (navigator.requestMediaKeySystemAccess &&
         // eslint-disable-next-line no-restricted-syntax
-        MediaKeySystemAccess.prototype.getConfiguration &&
-        safariVersion && safariVersion >= 14) {
+        MediaKeySystemAccess.prototype.getConfiguration) {
       // Unprefixed EME is preferable.
       return;
     }
-    */
 
     shaka.log.info('Using Apple-prefixed EME');
 

test/media/drm_engine_unit.js

@@ -2164,6 +2164,26 @@ function testDrmEngine(useMediaCapabilities) {
     });
   });
 
+  describe('isFairPlayKeySystem', () => {
+    it('should return true for FairPlay', () => {
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.apple.fps')).toBe(true);
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.apple.fps.1_0g')).toBe(true);
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.apple.fps.2_0')).toBe(true);
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.apple.fps.3_0')).toBe(true);
+    });
+
+    it('should return false for non-FairPlay key systems', () => {
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.widevine.alpha')).toBe(false);
+      expect(shaka.media.DrmEngine.isFairPlayKeySystem(
+          'com.abc.playready')).toBe(false);
+    });
+  });
+
   describe('getDrmInfo', () => {
     it('includes correct info', async () => {
       // Leave only one drmInfo