fix(Ads): Calculate the mimeType in an earlier step so that there is …

…no impact on the ad playback (#7742)
shaka-project · Dec 11, 2024 · c113738 · c113738
1 parent 172e713
commit c113738
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -511,13 +511,23 @@ shaka.ads.InterstitialAdManager = class {
   /**
    * @param {!Array.<shaka.extern.AdInterstitial>} interstitials
    */
-  addInterstitials(interstitials) {
+  async addInterstitials(interstitials) {
     let cuepointsChanged = false;
     for (const interstitial of interstitials) {
       if (!interstitial.uri) {
         shaka.log.alwaysWarn('Missing URL in interstitial', interstitial);
         continue;
       }
+      if (!interstitial.mimeType) {
+        try {
+          const netEngine = this.player_.getNetworkingEngine();
+          goog.asserts.assert(netEngine, 'Need networking engine');
+          // eslint-disable-next-line no-await-in-loop
+          interstitial.mimeType = await shaka.net.NetworkingUtils.getMimeType(
+              interstitial.uri, netEngine,
+              this.basePlayer_.getConfiguration().streaming.retryParameters);
+        } catch (error) {}
+      }
       const interstitialId = interstitial.id || JSON.stringify(interstitial);
       if (this.interstitialIds_.has(interstitialId)) {
         continue;
@@ -653,25 +663,13 @@ shaka.ads.InterstitialAdManager = class {
    * @param {number=} oncePlayed
    * @private
    */
-  async setupAd_(interstitial, sequenceLength, adPosition, initialTime,
+  setupAd_(interstitial, sequenceLength, adPosition, initialTime,
       oncePlayed = 0) {
     shaka.log.info('Starting interstitial',
         interstitial.startTime, 'at', this.lastTime_);
 
     this.lastPlayedAd_ = interstitial;
 
-    let interstitialMimeType = interstitial.mimeType;
-    if (!interstitialMimeType) {
-      try {
-        const netEngine = this.player_.getNetworkingEngine();
-        goog.asserts.assert(netEngine, 'Need networking engine');
-        // eslint-disable-next-line require-atomic-updates
-        interstitialMimeType = await shaka.net.NetworkingUtils.getMimeType(
-            interstitial.uri, netEngine,
-            this.basePlayer_.getConfiguration().streaming.retryParameters);
-      } catch (error) {}
-    }
-
     this.determineIfUsingBaseVideo_();
     goog.asserts.assert(this.video_, 'Must have video');
 
@@ -698,9 +696,9 @@ shaka.ads.InterstitialAdManager = class {
       }
     }
 
-    if (interstitialMimeType) {
-      if (interstitialMimeType.startsWith('image/') ||
-          interstitialMimeType === 'text/html') {
+    if (interstitial.mimeType) {
+      if (interstitial.mimeType.startsWith('image/') ||
+          interstitial.mimeType === 'text/html') {
         if (!interstitial.overlay) {
           shaka.log.alwaysWarn('Unsupported interstitial', interstitial);
           return;

diff --git a/test/ads/interstitial_ad_manager_unit.js b/test/ads/interstitial_ad_manager_unit.js
@@ -336,7 +336,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: false,
         skipOffset: null,
         skipFor: null,
@@ -385,7 +385,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 5,
         skipFor: 10,
@@ -430,7 +430,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -475,7 +475,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -520,7 +520,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -565,7 +565,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -610,7 +610,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -655,7 +655,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 100,
         endTime: 130,
         uri: 'test.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 0,
         skipFor: null,
@@ -710,7 +710,7 @@ describe('Interstitial Ad manager', () => {
         startTime: 0,
         endTime: null,
         uri: 'ad.m3u8',
-        mimeType: null,
+        mimeType: 'application/x-mpegurl',
         isSkippable: true,
         skipOffset: 5,
         skipFor: 10,