Revert "feat: Progress toward FairPlay DRM w/ MSE (shaka-project#3347)"

This reverts commit 31ba8d3. This should not have been cherry-picked to a release branch.
tecteun · Feb 10, 2022 · 211dc74 · 211dc74
1 parent 65d4707
commit 211dc74
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 34 deletions.
diff --git a/demo/main.js b/demo/main.js
@@ -1743,7 +1743,7 @@ shakaDemo.Main = class {
 shakaDemo.Main.commonDrmSystems = [
   'com.widevine.alpha',
   'com.microsoft.playready',
-  'com.apple.fps',
+  'com.apple.fps.1_0',
   'com.adobe.primetime',
   'org.w3.clearkey',
 ];

diff --git a/lib/media/drm_engine.js b/lib/media/drm_engine.js
@@ -632,17 +632,6 @@ 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.

diff --git a/lib/player.js b/lib/player.js
@@ -1237,7 +1237,24 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!mimeType) {
       // Try using the uri extension.
       const extension = shaka.media.ManifestParser.getExtension(uri);
-      mimeType = shaka.Player.SRC_EQUAL_EXTENSIONS_TO_MIME_TYPES_[extension];
+      mimeType = {
+        'mp4': 'video/mp4',
+        'm4v': 'video/mp4',
+        'm4a': 'audio/mp4',
+        'webm': 'video/webm',
+        'weba': 'audio/webm',
+        'mkv': 'video/webm', // Chromium browsers supports it.
+        'ts': 'video/mp2t',
+        'ogv': 'video/ogg',
+        'ogg': 'audio/ogg',
+        'mpg': 'video/mpeg',
+        'mpeg': 'video/mpeg',
+        'm3u8': 'application/x-mpegurl',
+        'mp3': 'audio/mpeg',
+        'aac': 'audio/aac',
+        'flac': 'audio/flac',
+        'wav': 'audio/wav',
+      }[extension];
     }
 
     // TODO: The load graph system has a design limitation that requires routing
@@ -2152,7 +2169,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         createSegmentIndex: () => Promise.resolve(),
         segmentIndex: null,
         mimeType: wants.mimeType ?
-            shaka.util.MimeUtils.getBasicType(wants.mimeType) : mimeType,
+            shaka.util.MimeUtils.getBasicType(wants.mimeType) : 'video/mp4',
         codecs: wants.mimeType ?
             shaka.util.MimeUtils.getCodecs(wants.mimeType) : '',
         encrypted: true,

diff --git a/test/media/drm_engine_unit.js b/test/media/drm_engine_unit.js
@@ -2013,26 +2013,6 @@ describe('DrmEngine', () => {
     });
   });
 
-  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_0')).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