fix(Ads): Update Alternative MPD to match the latest spec (#7706)

shaka-project · Dec 4, 2024 · cd78811 · cd78811
1 parent 8566836
commit cd78811
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/lib/ads/ad_manager.js b/lib/ads/ad_manager.js
@@ -844,14 +844,16 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
     if (this.config_ && this.config_.disableDASHInterstitial) {
       return;
     }
-    if (region.schemeIdUri == 'urn:mpeg:dash:event:alternativeMPD:2022') {
+    const schemeIdUri = region.schemeIdUri;
+    if (schemeIdUri == 'urn:mpeg:dash:event:alternativeMPD:insert:2025' ||
+        schemeIdUri == 'urn:mpeg:dash:event:alternativeMPD:replace:2025') {
       if (!this.interstitialAdManager_) {
         this.initInterstitial(/* adContainer= */ null, basePlayer, baseVideo);
       }
       if (this.interstitialAdManager_) {
         this.interstitialAdManager_.addRegion(region);
       }
-    } else if (region.schemeIdUri == 'urn:mpeg:dash:event:2012' &&
+    } else if (schemeIdUri == 'urn:mpeg:dash:event:2012' &&
         region.eventNode &&
         shaka.util.TXml.findChild(region.eventNode, 'OverlayEvent')) {
       if (!this.interstitialAdManager_) {

diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -317,14 +317,11 @@ shaka.ads.InterstitialAdManager = class {
    */
   addRegion(region) {
     let alternativeMPDUri;
-    let alternativeMPDmode;
     for (const node of region.eventNode.children) {
       if (node.tagName == 'AlternativeMPD') {
         const uri = node.attributes['uri'];
-        const mode = node.attributes['mode'];
         if (uri) {
           alternativeMPDUri = uri;
-          alternativeMPDmode = mode;
           break;
         }
       }
@@ -333,8 +330,10 @@ shaka.ads.InterstitialAdManager = class {
       shaka.log.alwaysWarn('Unsupported MPD alternate', region);
       return;
     }
-    const isReplace = alternativeMPDmode == 'replace';
-    const isInsert = alternativeMPDmode == 'insert';
+    const isReplace =
+        region.schemeIdUri == 'urn:mpeg:dash:event:alternativeMPD:replace:2025';
+    const isInsert =
+        region.schemeIdUri == 'urn:mpeg:dash:event:alternativeMPD:insert:2025';
     if (!isReplace && !isInsert) {
       shaka.log.warning('Unsupported MPD alternate', region);
       return;

diff --git a/test/ads/interstitial_ad_manager_unit.js b/test/ads/interstitial_ad_manager_unit.js
@@ -732,7 +732,7 @@ describe('Interstitial Ad manager', () => {
     it('supports alternative MPD', async () => {
       const eventString = [
         '<Event duration="1" id="PREROLL" presentationTime="0">',
-        '<AlternativeMPD mode="insert" uri="test.mpd"/>',
+        '<AlternativeMPD uri="test.mpd"/>',
         '</Event>',
       ].join('');
       const eventNode = TXml.parseXmlString(eventString);
@@ -741,7 +741,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: 1,
         id: 'PREROLL',
-        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:2022',
+        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:insert:2025',
         eventNode,
         eventElement: TXml.txmlNodeToDomElement(eventNode),
         value: '',
@@ -765,7 +765,7 @@ describe('Interstitial Ad manager', () => {
     it('ignore duplicate alternative MPD', async () => {
       const eventString = [
         '<Event duration="1" id="PREROLL" presentationTime="0">',
-        '<AlternativeMPD mode="insert" uri="test.mpd"/>',
+        '<AlternativeMPD uri="test.mpd"/>',
         '</Event>',
       ].join('');
       const eventNode = TXml.parseXmlString(eventString);
@@ -774,7 +774,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: 1,
         id: 'PREROLL',
-        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:2022',
+        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:insert:2025',
         eventNode,
         eventElement: TXml.txmlNodeToDomElement(eventNode),
         value: '',
@@ -800,7 +800,7 @@ describe('Interstitial Ad manager', () => {
       // It is not valid because it does not have an interstitial URL
       const eventString = [
         '<Event duration="1" id="PREROLL" presentationTime="0">',
-        '<AlternativeMPD mode="insert"/>',
+        '<AlternativeMPD/>',
         '</Event>',
       ].join('');
       const eventNode = TXml.parseXmlString(eventString);
@@ -809,7 +809,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: 1,
         id: 'PREROLL',
-        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:2022',
+        schemeIdUri: 'urn:mpeg:dash:event:alternativeMPD:insert:2025',
         eventNode,
         eventElement: TXml.txmlNodeToDomElement(eventNode),
         value: '',

diff --git a/test/test/assets/dash-mpd-alternate/dash.mpd b/test/test/assets/dash-mpd-alternate/dash.mpd
@@ -18,9 +18,9 @@ For more info about this video, see https://github.com/Axinom/dash-test-vectors
     </AdaptationSet>
   </Period>
   <Period id="1" duration="PT0H00M16.000S">
-    <EventStream schemeIdUri="urn:mpeg:dash:event:alternativeMPD:2022" timescale="10000000">
+    <EventStream schemeIdUri="urn:mpeg:dash:event:alternativeMPD:replace:2025" timescale="10000000">
       <Event presentationTime="0" duration="20000000" id="1">
-        <AlternativeMPD uri="/base/test/test/assets/dash-multi-codec/dash.mpd" mode="replace" />
+        <AlternativeMPD uri="/base/test/test/assets/dash-multi-codec/dash.mpd"/>
       </Event>
     </EventStream>
     <AdaptationSet segmentAlignment="true" group="1" maxWidth="1920" maxHeight="1080" maxFrameRate="24" par="16:9" lang="und">