Feature/improved codec check support (Dash-Industry-Forum#4575)

* WiP: Avoid duplicate codec capability checks * Optimize capabilities check by saving previously executed checks and avoid any duplicate checks * Add additional unit tests * Fix bug in Capabilities.js * Remove line in package.json * Add forced subtitle stream to reference client * Skip MediaCapability tests on Linux Firefox * Change CircleCI config to use medium+ resource class for the build * Change CircleCI config to use large resource class for the execution
qualabs · Sep 27, 2024 · 1e3c027 · 1e3c027
1 parent 3cad63d
commit 1e3c027
Show file tree

Hide file tree

Showing 13 changed files with 596 additions and 306 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,6 +5,7 @@ orbs:
 executors:
     dashjs-executor:
         working_directory: ~/repo
+        resource_class: large
         docker:
             -   image: cimg/node:20.11.1
 

diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,7 @@
   },
   "globals": {
     "dashjs": true,
+    "ManagedMediaSource": true,
     "WebKitMediaSource": true,
     "MediaSource": true,
     "WebKitMediaKeys": true,

diff --git a/index.d.ts b/index.d.ts
@@ -246,7 +246,7 @@ declare namespace dashjs {
 
         getAdaptationsForType(manifest: object, periodIndex: number, type: string): any[];
 
-        getCodec(adaptation: object, representationId: number, addResolutionInfo: boolean): string;
+        getCodec(adaptation: object, representationIndex: number, addResolutionInfo: boolean): string;
 
         getMimeType(adaptation: object): object;
 
@@ -754,7 +754,7 @@ declare namespace dashjs {
 
         getRepresentationSortFunction(): (a: object, b: object) => number;
 
-        getCodec(adaptation: object, representationId: number, addResolutionInfo: boolean): string;
+        getCodec(adaptation: object, representationIndex: number, addResolutionInfo: boolean): string;
 
         getBandwidthForRepresentation(representationId: string, periodIdx: number): number;
 
@@ -3998,7 +3998,9 @@ declare namespace dashjs {
 
         supportsEncryptedMedia(): boolean;
 
-        supportsCodec(config: object, type: string): Promise<boolean>;
+        isCodecSupportedBasedOnTestedConfigurations(basicConfiguration: object, type: string): boolean;
+
+        runCodecSupportCheck(basicConfiguration: object, type: string): Promise<void>;
 
         setEncryptedMediaSupported(value: boolean): void;
 

diff --git a/samples/dash-if-reference-player/app/sources.json b/samples/dash-if-reference-player/app/sources.json
@@ -88,6 +88,11 @@
             "acronym": "Dolby",
             "name": "Dolby Laboratories Inc.",
             "url": "https://www.dolby.com/"
+        },
+        "arte": {
+            "acronym": "ARTE",
+            "name": "ARTE",
+            "url": "https://www.arte.tv/en/"
         }
     },
     "items": [
@@ -473,6 +478,11 @@
                     "url": "https://dash.akamaized.net/dash264/CTA/imsc1/IT1-20171027_dash.mpd",
                     "name": "IMSC1 Text Subtitles via sidecar file",
                     "provider": "cta"
+                },
+                {
+                    "name": "Arte forced-subtitles",
+                    "url": "https://arteamd1.akamaized.net/GPU/034000/034700/034755-230-A/221125154117/034755-230-A_8_DA_v20221125.mpd",
+                    "provider": "arte"
                 }
             ]
         },

diff --git a/src/dash/DashAdapter.js b/src/dash/DashAdapter.js
@@ -734,8 +734,8 @@ function DashAdapter() {
      * @memberOf module:DashAdapter
      * @instance
      */
-    function getCodec(adaptation, representationId, addResolutionInfo) {
-        return dashManifestModel.getCodec(adaptation, representationId, addResolutionInfo);
+    function getCodec(adaptation, representationIndex, addResolutionInfo) {
+        return dashManifestModel.getCodec(adaptation, representationIndex, addResolutionInfo);
     }
 
     /**

diff --git a/src/dash/models/DashManifestModel.js b/src/dash/models/DashManifestModel.js
@@ -373,12 +373,12 @@ function DashManifestModel() {
         return adaptations;
     }
 
-    function getCodec(adaptation, representationId, addResolutionInfo) {
+    function getCodec(adaptation, representationIndex, addResolutionInfo) {
         let codec = null;
 
         if (adaptation && adaptation.Representation && adaptation.Representation.length > 0) {
-            const representation = isInteger(representationId) && representationId >= 0 && representationId < adaptation.Representation.length ?
-                adaptation.Representation[representationId] : adaptation.Representation[0];
+            const representation = isInteger(representationIndex) && representationIndex >= 0 && representationIndex < adaptation.Representation.length ?
+                adaptation.Representation[representationIndex] : adaptation.Representation[0];
             if (representation) {
                 codec = representation.mimeType + ';codecs="' + representation.codecs + '"';
                 if (addResolutionInfo && representation.width !== undefined) {