add type check prior to merging values

Author: stschr

src/dash/parser/objectiron.js

@@ -33,9 +33,11 @@ import FactoryMaker from '../../core/FactoryMaker.js';
 function ObjectIron(mappers) {
 
     function _mergeValues(parentItem, childItem) {
-        for (let name in parentItem) {
-            if (!childItem.hasOwnProperty(name)) {
-                childItem[name] = parentItem[name];
+        if (typeof parentItem === 'object') {
+            for (let name in parentItem) {
+                if (!childItem.hasOwnProperty(name)) {
+                    childItem[name] = parentItem[name];
+                }
             }
         }
     }
@@ -61,7 +63,9 @@ function ObjectIron(mappers) {
                 if (propertyIsArray) {
                     childNode[propertyName].push(propertyElementFromParent);
                 } else {
-                    // see ISO 23009-1 (6th ed), clause 5.3.9.1
+                    // non-Array Properties can be:
+                    // - certain elements (e.g. SegmentList, see ISO 23009-1 (6th ed), clause 5.3.9.1) or 
+                    // - attributes (e.g. codecs)
                     _mergeValues(propertyElementFromParent, childNode[propertyName]);
                 }
             } else {

test/unit/data/dash/manifest_properties.xml

@@ -1,7 +1,7 @@
 <MPD mediaPresentationDuration="PT634.566S" minBufferTime="PT2.00S" profiles="urn:hbbtv:dash:profile:isoff-live:2012,urn:mpeg:dash:profile:isoff-live:2011" type="static" xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd">
     <BaseURL>./</BaseURL>
     <Period>
-        <AdaptationSet mimeType="audio/mp4" contentType="audio" subsegmentAlignment="true" subsegmentStartsWithSAP="1" lang="es">
+        <AdaptationSet id="as_1" codecs="mp4a.40.2" mimeType="audio/mp4" contentType="audio" subsegmentAlignment="true" subsegmentStartsWithSAP="1" lang="es">
             <Label lang="en">English Label</Label>
             <Label lang="fre">French Label</Label>
             <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="6"/>

test/unit/test/dash/dash.DashParser.js

@@ -90,7 +90,7 @@ describe('DashParser', function () {
             expect(rawRepresentation.SupplementalProperty.length).to.equal(4);
         });
 
-        it('should map only allowed attributes SegmentTemplate from AdaptationSet to Representation', async () => {
+        it('should map only allowed non-Array attributes from AdaptationSet to Representation', async () => {
             let parsedMpd = dashParser.parse(manifest_prop);
             let rawAdaptationSet = parsedMpd.Period[0].AdaptationSet[0];
             let rawRepresentation = rawAdaptationSet.Representation[0];
@@ -102,6 +102,14 @@ describe('DashParser', function () {
             expect(rawRepresentation.SegmentTemplate.duration).to.equal(300000);
         });
 
+        it('should not map attributes', async () => {
+            let parsedMpd = dashParser.parse(manifest_prop);
+            let rawAdaptationSet = parsedMpd.Period[0].AdaptationSet[0];
+            let rawRepresentation = rawAdaptationSet.Representation[0];
+
+            expect(rawRepresentation.codecs).to.equal('mp4a.40.5');
+        });
+
     });
 })