fix(DASH): Fix DASH_DUPLICATE_REPRESENTATION_ID error when using supp…

…lemental codec (#7961) Fixes #7948
shaka-project · Jan 29, 2025 · b183197 · b183197
1 parent 3f1fdbe
commit b183197
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/dash/dash_parser.js b/lib/dash/dash_parser.js
@@ -1983,6 +1983,10 @@ shaka.dash.DashParser = class {
           // Duplicate representations with their supplementalCodecs
           const obj = shaka.util.ObjectUtils.cloneObject(rep);
           obj.attributes['codecs'] = supplementalCodecs.split(' ').join(',');
+          if (obj.attributes['id']) {
+            obj.attributes['supplementalId'] =
+                obj.attributes['id'] + '_supplementalCodecs';
+          }
           supplementalRepresentations.push(obj);
         }
       }
@@ -2048,8 +2052,9 @@ shaka.dash.DashParser = class {
     }
 
     const repIds = representations
-        .map((node) => { return node.attributes['id']; })
-        .filter(shaka.util.Functional.isNotNull);
+        .map((node) => {
+          return node.attributes['supplementalId'] || node.attributes['id'];
+        }).filter(shaka.util.Functional.isNotNull);
 
     return {
       id: adaptationId,
@@ -2580,6 +2585,7 @@ shaka.dash.DashParser = class {
     const evalDivision = TXml.evalDivision;
 
     const id = elem.attributes['id'];
+    const supplementalId = elem.attributes['supplementalId'];
     const uriObjs = TXml.findChildren(elem, 'BaseURL');
     let calculatedBaseUris;
     let someLocationValid = false;
@@ -2694,7 +2700,8 @@ shaka.dash.DashParser = class {
       frameRate: frameRate,
       pixelAspectRatio: pixelAspectRatio,
       emsgSchemeIdUris: emsgSchemeIdUris,
-      id: id,
+      id: supplementalId || id,
+      originalId: id,
       language: elem.attributes['lang'],
       numChannels: numChannels,
       audioSamplingRate: audioSamplingRate,
@@ -3243,6 +3250,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   pixelAspectRatio: (string|undefined),
  *   emsgSchemeIdUris: !Array<string>,
  *   id: ?string,
+ *   originalId: ?string,
  *   position: (number|undefined),
  *   language: ?string,
  *   numChannels: ?number,
@@ -3284,6 +3292,8 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   emsg registered schemeIdUris.
  * @property {?string} id
  *   The ID of the element.
+ * @property {?string} originalId
+ *   The original ID of the element.
  * @property {number|undefined} position
  *   Position of the element used for indexing in case of no id
  * @property {?string} language

diff --git a/lib/dash/segment_template.js b/lib/dash/segment_template.js
@@ -135,7 +135,7 @@ shaka.dash.SegmentTemplate = class {
         shaka.log.debug(`Creating TSI with end ${periodEnd}`);
         segmentIndex = new TimelineSegmentIndex(
             info,
-            context.representation.id,
+            context.representation.originalId,
             context.bandwidth,
             context.representation.getBaseUris,
             context.urlParams,
@@ -348,7 +348,7 @@ shaka.dash.SegmentTemplate = class {
 
     goog.asserts.assert(info.indexTemplate, 'must be using index template');
     const filledTemplate = MpdUtils.fillUriTemplate(
-        info.indexTemplate, context.representation.id,
+        info.indexTemplate, context.representation.originalId,
         null, null, context.bandwidth || null, null);
 
     const resolvedUris = ManifestParserUtils.resolveUris(
@@ -677,7 +677,7 @@ shaka.dash.SegmentTemplate = class {
     }
     initialization = shaka.util.StringUtils.htmlUnescape(initialization);
 
-    const repId = context.representation.id;
+    const repId = context.representation.originalId;
     const bandwidth = context.bandwidth || null;
     const getBaseUris = context.representation.getBaseUris;
     const urlParams = context.urlParams;