@newrelic/video-videojs 4.1.0 → 4.1.2

package/src/techs/contrib-hls.js

@@ -15,7 +15,7 @@ export default class ContribHlsTech {
   getRenditionBitrate() {
     try {
       var media = this.tech.playlists.media();
-      if (media && media.attributes) return media.attributes.BANDWIDTH;
+      if (media && media.attributes) return Math.round(media.attributes.BANDWIDTH);
     } catch (err) {}
     return null;
   }
@@ -50,7 +50,7 @@ export default class ContribHlsTech {
       // Return highest available bitrate from all renditions
       const playlists = this.tech.playlists.master.playlists;
       if (playlists && playlists.length > 0) {
-        return Math.max(...playlists.map((p) => p.attributes.BANDWIDTH));
+        return Math.round(Math.max(...playlists.map((p) => p.attributes.BANDWIDTH)));
       }
     } catch (err) {}
     return null;
@@ -61,14 +61,14 @@ export default class ContribHlsTech {
       this.tech.stats?.bandwidth !== undefined &&
       this.tech.stats.bandwidth > 0
     ) {
-      return this.tech.stats.bandwidth;
+      return Math.round(this.tech.stats.bandwidth);
     }
     return null;
   }
 
   getNetworkDownloadBitrate() {
     if (this.tech.throughput !== undefined && this.tech.throughput > 0) {
-      return this.tech.throughput;
+      return Math.round(this.tech.throughput);
     }
     return null;
   }
@@ -79,11 +79,10 @@ export default class ContribHlsTech {
       const media = this.tech.playlists.media();
       if (media && media.attributes) {
         // Use AVERAGE-BANDWIDTH if available, fallback to BANDWIDTH
-        return (
-          media.attributes['AVERAGE-BANDWIDTH'] ||
+        const bitrate = media.attributes['AVERAGE-BANDWIDTH'] ||
           media.attributes.BANDWIDTH ||
-          null
-        );
+          null;
+        return bitrate !== null ? Math.round(bitrate) : null;
       }
     } catch (err) {}
     return null;

package/src/techs/hls-js.js

@@ -19,7 +19,7 @@ export default class HlsJs {
   getRenditionBitrate(tech) {
     try {
       var level = this.tech.levels[this.tech.currentLevel];
-      if (level && level.bitrate) return level.bitrate;
+      if (level && level.bitrate) return Math.round(level.bitrate);
     } catch (err) {}
     return null;
   }
@@ -50,7 +50,7 @@ export default class HlsJs {
       // Get the current active level's bitrate from manifest
       const level = this.tech.levels[this.tech.currentLevel];
       if (level && level.bitrate) {
-        return level.bitrate;
+        return Math.round(level.bitrate);
       }
     } catch (err) {}
     return null;
@@ -60,7 +60,7 @@ export default class HlsJs {
     try {
       // Return highest available bitrate from all renditions
       if (this.tech.levels && this.tech.levels.length > 0) {
-        return Math.max(...this.tech.levels.map(l => l.bitrate));
+        return Math.round(Math.max(...this.tech.levels.map(l => l.bitrate)));
       }
     } catch (err) {}
     return null;
@@ -70,14 +70,14 @@ export default class HlsJs {
     try {
       // VHS stats.bandwidth
       if (this.tech.stats && this.tech.stats.bandwidth > 0)
-        return this.tech.stats.bandwidth;
+        return Math.round(this.tech.stats.bandwidth);
     } catch (err) {}
     return null;
   }
 
   getNetworkDownloadBitrate() {
     if (this.tech.throughput && this.tech.throughput > 0) {
-      return this.tech.throughput;
+      return Math.round(this.tech.throughput);
     }
     return null;
   }

package/src/techs/shaka.js

@@ -13,7 +13,8 @@ export default class ShakaTech {
 
   getRenditionBitrate(tech) {
     try {
-      return this.tech.getStats().streamBandwidth;
+      const bitrate = this.tech.getStats().streamBandwidth;
+      return bitrate ? Math.round(bitrate) : null;
     } catch (err) {}
     return null;
   }
@@ -23,9 +24,9 @@ export default class ShakaTech {
       // Return highest available bitrate from all variants
       const tracks = this.tech.getVariantTracks();
       if (tracks && tracks.length > 0) {
-        return Math.max(
+        return Math.round(Math.max(
           ...tracks.map((t) => t.videoBandwidth + (t.audioBandwidth || 0)),
-        );
+        ));
       }
     } catch (err) {}
     return null;
@@ -67,7 +68,7 @@ export default class ShakaTech {
       // Get the current variant's bitrate from manifest (streamBandwidth)
       var stats = this.tech.getStats();
       if (stats && stats.streamBandwidth && stats.streamBandwidth > 0) {
-        return stats.streamBandwidth;
+        return Math.round(stats.streamBandwidth);
       }
     } catch (err) {}
     return null;
@@ -78,7 +79,7 @@ export default class ShakaTech {
       // Use estimatedBandwidth for measured bitrate
       var stats = this.tech.getStats();
       if (stats && stats.estimatedBandwidth > 0) {
-        return stats.estimatedBandwidth;
+        return Math.round(stats.estimatedBandwidth);
       }
     } catch (err) {}
     return null;
@@ -89,7 +90,7 @@ export default class ShakaTech {
       // Shaka: use estimatedBandwidth for download bitrate (no separate property)
       var stats = this.tech.getStats();
       if (stats && stats.estimatedBandwidth > 0) {
-        return stats.estimatedBandwidth;
+        return Math.round(stats.estimatedBandwidth);
       }
     } catch (err) {}
     return null;

package/src/tracker.js

@@ -8,11 +8,12 @@ import ImaAdsTracker from './ads/ima';
 import BrightcoveImaAdsTracker from './ads/brightcove-ima';
 import FreewheelAdsTracker from './ads/freewheel';
 import DaiAdsTracker from './ads/dai';
+import MediaTailorAdsTracker from './ads/media-tailor';
 
 export default class VideojsTracker extends nrvideo.VideoTracker {
   constructor(player, options) {
     super(player, options);
-
+    this.options = options;
     this.isContentEnd = false;
     this.imaAdCuePoints = '';
     this.daiInitialized = false;
@@ -125,17 +126,17 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
       if (tech?.vhs?.playlists?.media()) {
         const activePlaylist = tech.vhs.playlists.media();
         // Use AVERAGE-BANDWIDTH if available, fallback to BANDWIDTH
-        return (
-          activePlaylist.attributes['AVERAGE-BANDWIDTH'] ||
+        const bitrate = activePlaylist.attributes['AVERAGE-BANDWIDTH'] ||
           activePlaylist.attributes.BANDWIDTH ||
-          null
-        );
+          null;
+        return bitrate !== null ? Math.round(bitrate) : null;
       }
 
       // 2. Fallback to tech wrappers (Shaka/Hls.js) if they have a getBitrate method
       const techWrapper = this.getTech();
       if (techWrapper?.getBitrate) {
-        return techWrapper.getBitrate();
+        const bitrate = techWrapper.getBitrate();
+        return bitrate !== null ? Math.round(bitrate) : null;
       }
     } catch (err) {
       /* ignore */
@@ -161,13 +162,14 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
         const maxBitrate = Math.max(
           ...allRenditions.map((p) => p.attributes.BANDWIDTH || 0),
         );
-        return maxBitrate > 0 ? maxBitrate : null;
+        return maxBitrate > 0 ? Math.round(maxBitrate) : null;
       }
 
       // Fallback to tech wrappers (Shaka/Hls.js)
       const techWrapper = this.getTech();
       if (techWrapper?.getManifestBitrate) {
-        return techWrapper.getManifestBitrate();
+        const bitrate = techWrapper.getManifestBitrate();
+        return bitrate !== null ? Math.round(bitrate) : null;
       }
     } catch (e) {
       /* ignore */
@@ -181,13 +183,14 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
 
       // VHS stats.bandwidth
       if (tech?.vhs?.stats?.bandwidth && tech.vhs.stats.bandwidth > 0) {
-        return tech.vhs.stats.bandwidth;
+        return Math.round(tech.vhs.stats.bandwidth);
       }
 
       // Fallback to tech wrappers (Shaka/Hls.js)
       const techWrapper = this.getTech();
       if (techWrapper?.getSegmentDownloadBitrate) {
-        return techWrapper.getSegmentDownloadBitrate();
+        const bitrate = techWrapper.getSegmentDownloadBitrate();
+        return bitrate !== null ? Math.round(bitrate) : null;
       }
     } catch (err) {
       /* ignore */
@@ -199,13 +202,14 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
     const tech = this.player.tech({ IWillNotUseThisInPlugins: true });
 
     if (tech?.vhs?.throughput && tech.vhs.throughput > 0) {
-      return tech.vhs.throughput;
+      return Math.round(tech.vhs.throughput);
     }
 
     // Fallback to tech wrapper implementation
     const techWrapper = this.getTech();
     if (techWrapper?.getNetworkDownloadBitrate) {
-      return techWrapper.getNetworkDownloadBitrate();
+      const bitrate = techWrapper.getNetworkDownloadBitrate();
+      return bitrate !== null ? Math.round(bitrate) : null;
     }
 
     return null;
@@ -318,6 +322,21 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
 
   onDownload(e) {
     this.sendDownload({ state: e.type });
+
+    // Check if MediaTailor should be used after the source is loaded
+    // Only check on 'loadstart' to avoid multiple checks
+    if (
+      !this.adsTracker &&
+      e.type === 'loadstart' &&
+      MediaTailorAdsTracker.isUsing(this.player)
+    ) {
+      console.log(
+        'VideojsTracker: Creating MediaTailorAdsTracker after source load'
+      );
+      this.setAdsTracker(new MediaTailorAdsTracker(this.player, this.options));
+      // MediaTailor SSAI starts with content, not ads (unlike client-side ad frameworks)
+      this.adsTracker.setIsAd(false);
+    }
   }
 
   // DAI methods
@@ -369,15 +388,35 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
     this.FreewheelAdsCompleted = true;
   }
 
+  /**
+   * Check if ads tracker is currently in ad mode
+   * @returns {boolean} True if ads are playing
+   */
+  isAdsTrackerActive() {
+    return this.adsTracker && this.adsTracker.isAd && this.adsTracker.isAd();
+  }
+
   onPlay() {
     this.sendRequest();
   }
 
   onPause() {
+    // Don't send CONTENT_PAUSE if ads are playing (ads tracker handles it)
+    if (this.isAdsTrackerActive()) {
+      return;
+    }
+    // Don't send CONTENT_PAUSE if video has ended (CONTENT_END will be sent instead)
+    if (this.player.ended()) {
+      return;
+    }
     this.sendPause();
   }
 
   onPlaying() {
+    // Don't send CONTENT_RESUME if ads are playing (ads tracker handles it)
+    if (this.isAdsTrackerActive()) {
+      return;
+    }
     this.sendResume();
     this.sendBufferEnd();
   }
@@ -402,10 +441,18 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
   }
 
   onSeeking() {
+    // Don't send CONTENT_SEEK_START if ads are playing (ads tracker handles it)
+    if (this.isAdsTrackerActive()) {
+      return;
+    }
     this.sendSeekStart();
   }
 
   onSeeked() {
+    // Don't send CONTENT_SEEK_END if ads are playing (ads tracker handles it)
+    if (this.isAdsTrackerActive()) {
+      return;
+    }
     this.sendSeekEnd();
   }
 
@@ -420,6 +467,10 @@ export default class VideojsTracker extends nrvideo.VideoTracker {
   }
 
   onWaiting(e) {
+    // Don't send CONTENT_BUFFER_START if ads are playing (ads tracker handles it)
+    if (this.isAdsTrackerActive()) {
+      return;
+    }
     this.sendBufferStart();
   }
 
@@ -439,4 +490,5 @@ export {
   ImaAdsTracker,
   BrightcoveImaAdsTracker,
   FreewheelAdsTracker,
+  MediaTailorAdsTracker,
 };