fix: Fix DRM workaround with fLaC and Opus boxes (#8070)

Backported to v4.9.x

Author: avelad

lib/media/content_workarounds.js

@@ -58,6 +58,20 @@ shaka.media.ContentWorkarounds = class {
     /** @type {!Array.<{box: shaka.extern.ParsedBox, newType: number}>} */
     const boxesToModify = [];
 
+    const pushEncv = (box) => {
+      boxesToModify.push({
+        box,
+        newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+      });
+    };
+
+    const pushEnca = (box) => {
+      boxesToModify.push({
+        box,
+        newType: ContentWorkarounds.BOX_TYPE_ENCA_,
+      });
+    };
+
     new shaka.util.Mp4Parser()
         .box('moov', onSimpleAncestorBox)
         .box('trak', onSimpleAncestorBox)
@@ -71,78 +85,23 @@ shaka.media.ContentWorkarounds = class {
         })
         .fullBox('encv', onEncryptionMetadataBox)
         .fullBox('enca', onEncryptionMetadataBox)
-        .fullBox('dvav', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('dva1', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('dvh1', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('dvhe', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('hev1', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('hvc1', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('avc1', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('avc3', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
-          });
-        })
-        .fullBox('ac-3', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCA_,
-          });
-        })
-        .fullBox('ec-3', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCA_,
-          });
-        })
-        .fullBox('ac-4', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCA_,
-          });
-        })
-        .fullBox('mp4a', (box) => {
-          boxesToModify.push({
-            box,
-            newType: ContentWorkarounds.BOX_TYPE_ENCA_,
-          });
-        }).parse(initSegment);
+        .fullBox('dvav', pushEncv)
+        .fullBox('dva1', pushEncv)
+        .fullBox('dvh1', pushEncv)
+        .fullBox('dvhe', pushEncv)
+        .fullBox('dvc1', pushEncv)
+        .fullBox('dvi1', pushEncv)
+        .fullBox('hev1', pushEncv)
+        .fullBox('hvc1', pushEncv)
+        .fullBox('avc1', pushEncv)
+        .fullBox('avc3', pushEncv)
+        .fullBox('ac-3', pushEnca)
+        .fullBox('ec-3', pushEnca)
+        .fullBox('ac-4', pushEnca)
+        .fullBox('Opus', pushEnca)
+        .fullBox('fLaC', pushEnca)
+        .fullBox('mp4a', pushEnca)
+        .parse(initSegment);
 
     if (isEncrypted) {
       shaka.log.debug('Init segment already indicates encryption.');

test/media/content_workarounds_unit.js

@@ -24,6 +24,8 @@ describe('ContentWorkarounds', () => {
       'ac-3',
       'ec-3',
       'ac-4',
+      'Opus',
+      'fLaC',
       'mp4a',
     ],
   };