Use vhs-utils codec parsing functions for EME setup

videojs · Mar 15, 2021 · 49d90e6 · 49d90e6
1 parent 77186f2
commit 49d90e6
Showing 1 changed file with 10 additions and 21 deletions.
diff --git a/src/videojs-http-streaming.js b/src/videojs-http-streaming.js
@@ -30,7 +30,12 @@ import {
   comparePlaylistBandwidth,
   comparePlaylistResolution
 } from './playlist-selectors.js';
-import {isAudioCodec, isVideoCodec, browserSupportsCodec} from '@videojs/vhs-utils/es/codecs.js';
+import {
+  browserSupportsCodec,
+  getMimeForCodec,
+  parseCodecs
+} from '@videojs/vhs-utils/es/codecs.js';
+import { unwrapCodecList } from './util/codecs.js';
 import logger from './util/logger';
 import {SAFE_TIME_DELTA} from './ranges';
 
@@ -132,34 +137,18 @@ const emeKeySystems = (keySystemOptions, mainPlaylist, audioPlaylist) => {
     return keySystemOptions;
   }
 
-  const codecs = {};
+  let codecs = {};
 
   if (mainPlaylist && mainPlaylist.attributes && mainPlaylist.attributes.CODECS) {
-    const mainCodecs = mainPlaylist.attributes.CODECS;
-
-    if (mainCodecs.split(',').length > 1) {
-      mainCodecs.split(',').forEach(function(codec) {
-        codec = codec.trim();
-
-        if (isAudioCodec(codec)) {
-          codecs.audio = codec;
-        } else if (isVideoCodec(codec)) {
-          codecs.video = codec;
-        }
-      });
-    } else if (isAudioCodec(mainCodecs)) {
-      codecs.audio = mainCodecs;
-    } else {
-      codecs.video = mainCodecs;
-    }
+    codecs = unwrapCodecList(parseCodecs(mainPlaylist.attributes.CODECS));
   }
 
   if (audioPlaylist && audioPlaylist.attributes && audioPlaylist.attributes.CODECS) {
     codecs.audio = audioPlaylist.attributes.CODECS;
   }
 
-  const videoContentType = codecs.video ? `video/mp4;codecs="${codecs.video}"` : null;
-  const audioContentType = codecs.audio ? `audio/mp4;codecs="${codecs.audio}"` : null;
+  const videoContentType = getMimeForCodec(codecs.video);
+  const audioContentType = getMimeForCodec(codecs.audio);
 
   // upsert the content types based on the selected playlist
   const keySystemContentTypes = {};