shaka-player 4.8.4 → 4.8.5

package/externs/ima.js

@@ -204,6 +204,8 @@ google.ima.AdDisplayContainer = class {
   constructor(adContainer, video) {}
 
   initialize() {}
+
+  destroy() {}
 };
 
 

package/lib/ads/client_side_ad_manager.js

@@ -63,16 +63,17 @@ shaka.ads.ClientSideAdManager = class {
 
     google.ima.settings.setDisableCustomPlaybackForIOS10Plus(true);
 
-    const adDisplayContainer = new google.ima.AdDisplayContainer(
+    /** @private {!google.ima.AdDisplayContainer} */
+    this.adDisplayContainer_ = new google.ima.AdDisplayContainer(
         this.adContainer_,
         this.video_);
 
     // TODO: IMA: Must be done as the result of a user action on mobile
-    adDisplayContainer.initialize();
+    this.adDisplayContainer_.initialize();
 
     // IMA: This instance should be re-used for the entire lifecycle of
     // the page.
-    this.adsLoader_ = new google.ima.AdsLoader(adDisplayContainer);
+    this.adsLoader_ = new google.ima.AdsLoader(this.adDisplayContainer_);
 
     this.adsLoader_.getSettings().setPlayerType('shaka-player');
     this.adsLoader_.getSettings().setPlayerVersion(shaka.Player.version);
@@ -176,6 +177,7 @@ shaka.ads.ClientSideAdManager = class {
       this.imaAdsManager_.destroy();
     }
     this.adsLoader_.destroy();
+    this.adDisplayContainer_.destroy();
   }
 
   /**

package/lib/hls/hls_parser.js

@@ -928,13 +928,12 @@ shaka.hls.HlsParser = class {
     if (!playlist.segments.length) {
       return defaultBasicInfo;
     }
-    const middleSegmentIdx = Math.trunc((playlist.segments.length - 1) / 2);
-    const middleSegment = playlist.segments[middleSegmentIdx];
-    const middleSegmentUris = shaka.hls.Utils.constructSegmentUris(
+    const firstSegment = playlist.segments[0];
+    const firstSegmentUris = shaka.hls.Utils.constructSegmentUris(
         getUris(),
-        playlist.segments[0].verbatimSegmentUri);
-    const middleSegmentUri = middleSegmentUris[0];
-    const parsedUri = new goog.Uri(middleSegmentUri);
+        firstSegment.verbatimSegmentUri);
+    const firstSegmentUri = firstSegmentUris[0];
+    const parsedUri = new goog.Uri(firstSegmentUri);
     const extension = parsedUri.getPath().split('.').pop();
     const rawMimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_[extension];
     if (rawMimeType) {
@@ -946,7 +945,7 @@ shaka.hls.HlsParser = class {
 
     let initData = null;
     const initSegmentRef = this.getInitSegmentReference_(
-        playlist, middleSegment.tags, getUris);
+        playlist, firstSegment.tags, getUris);
     this.mapTagToInitSegmentRefMap_.clear();
     if (initSegmentRef) {
       const initSegmentRequest = shaka.util.Networking.createSegmentRequest(
@@ -961,8 +960,17 @@ shaka.hls.HlsParser = class {
       initData = initResponse.data;
     }
 
-    const segmentRequest = shaka.net.NetworkingEngine.makeRequest(
-        middleSegmentUris, this.config_.retryParameters);
+    let startByte = 0;
+    let endByte = null;
+    const byterangeTag = shaka.hls.Utils.getFirstTagWithName(
+        firstSegment.tags, 'EXT-X-BYTERANGE');
+    if (byterangeTag) {
+      [startByte, endByte] = this.parseByteRange_(
+          /* previousReference= */ null, byterangeTag.value);
+    }
+
+    const segmentRequest = shaka.util.Networking.createSegmentRequest(
+        firstSegmentUris, startByte, endByte, this.config_.retryParameters);
     const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
     const response = await this.makeNetworkRequest_(
         segmentRequest, requestType, {type});
@@ -980,7 +988,8 @@ shaka.hls.HlsParser = class {
         return basicInfo;
       }
     } else if (extension == 'mp4' || extension == 'cmfv' ||
-        extension == 'm4s' || contentMimeType == 'video/mp4' ||
+        extension == 'm4s' || extension == 'fmp4' ||
+        contentMimeType == 'video/mp4' ||
         contentMimeType == 'audio/mp4' ||
         contentMimeType == 'video/iso.segment') {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(

package/lib/media/media_source_engine.js

@@ -280,7 +280,7 @@ shaka.media.MediaSourceEngine = class {
         if (contentType == ContentType.VIDEO) {
           codecs = StreamUtils.getCorrectVideoCodecs(codecs);
         } else if (contentType == ContentType.AUDIO) {
-          codecs = StreamUtils.getCorrectAudioCodecs(codecs);
+          codecs = StreamUtils.getCorrectAudioCodecs(codecs, mimeType);
         }
         const extendedMimeType = MimeUtils.getExtendedType(
             stream, mimeType, codecs);

package/lib/player.js

@@ -7217,7 +7217,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.4' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.5' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/transmuxer/ts_transmuxer.js

@@ -144,13 +144,17 @@ shaka.transmuxer.TsTransmuxer = class {
   convertCodecs(contentType, mimeType) {
     if (this.isTsContainer_(mimeType)) {
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
+      const StreamUtils = shaka.util.StreamUtils;
       // The replace it's necessary because Firefox(the only browser that
       // supports MP3 in MP4) only support the MP3 codec with the mp3 string.
       // MediaSource.isTypeSupported('audio/mp4; codecs="mp4a.40.34"') -> false
       // MediaSource.isTypeSupported('audio/mp4; codecs="mp3"') -> true
       const codecs = shaka.util.MimeUtils.getCodecs(mimeType)
           .replace('mp4a.40.34', 'mp3').split(',')
-          .map(shaka.util.StreamUtils.getCorrectVideoCodecs).join(',');
+          .map((codecs) => {
+            return StreamUtils.getCorrectAudioCodecs(codecs, 'audio/mp4');
+          })
+          .map(StreamUtils.getCorrectVideoCodecs).join(',');
       if (contentType == ContentType.AUDIO) {
         return `audio/mp4; codecs="${codecs}"`;
       }

package/lib/util/platform.js

@@ -198,8 +198,8 @@ shaka.util.Platform = class {
   }
 
   /**
-   * Check if the current platform is a Google Chromecast with Android
-   * (i.e. Chromecast with GoogleTV).
+   * Check if the current platform is a Google Chromecast with Fuchsia
+   * (i.e. Google Nest Hub).
    *
    * @return {boolean}
    */
@@ -594,7 +594,8 @@ shaka.util.Platform = class {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.
-    if (Platform.isChromecast() && !Platform.isAndroidCastDevice()) {
+    if (Platform.isChromecast() && !Platform.isAndroidCastDevice() &&
+        !Platform.isFuchsiaCastDevice()) {
       return false;
     }
     // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759

package/lib/util/stream_utils.js

@@ -429,7 +429,8 @@ shaka.util.StreamUtils = class {
         videoCodecs = StreamUtils.getCorrectVideoCodecs(videoCodecs);
         let audioCodecs = ManifestParserUtils.guessCodecs(
             ContentType.AUDIO, allCodecs);
-        audioCodecs = StreamUtils.getCorrectAudioCodecs(audioCodecs);
+        audioCodecs = StreamUtils.getCorrectAudioCodecs(
+            audioCodecs, video.mimeType);
 
         const audioFullType = MimeUtils.getFullOrConvertedType(
             video.mimeType, audioCodecs, ContentType.AUDIO);
@@ -465,7 +466,8 @@ shaka.util.StreamUtils = class {
     }
 
     if (audio) {
-      const codecs = StreamUtils.getCorrectAudioCodecs(audio.codecs);
+      const codecs = StreamUtils.getCorrectAudioCodecs(
+          audio.codecs, audio.mimeType);
       const fullType = MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
@@ -754,17 +756,18 @@ shaka.util.StreamUtils = class {
         // We ignore the multiplexed audio when there is normal audio also.
         if (videoCodecs.includes(',') && !audio) {
           const allCodecs = videoCodecs.split(',');
+          const baseMimeType = MimeUtils.getBasicType(fullMimeType);
 
           videoCodecs = ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
 
           let audioCodecs = ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
-          audioCodecs = StreamUtils.getCorrectAudioCodecs(audioCodecs);
+          audioCodecs = StreamUtils.getCorrectAudioCodecs(
+              audioCodecs, baseMimeType);
 
           const audioFullType = MimeUtils.getFullOrConvertedType(
-              MimeUtils.getBasicType(fullMimeType), audioCodecs,
-              ContentType.AUDIO);
+              baseMimeType, audioCodecs, ContentType.AUDIO);
 
           audioConfigs.push({
             contentType: audioFullType,
@@ -815,10 +818,11 @@ shaka.util.StreamUtils = class {
     }
     if (audio) {
       for (const fullMimeType of audio.fullMimeTypes) {
-        const codecs = StreamUtils.getCorrectAudioCodecs(MimeUtils.getCodecs(
-            fullMimeType));
+        const baseMimeType = MimeUtils.getBasicType(fullMimeType);
+        const codecs = StreamUtils.getCorrectAudioCodecs(
+            MimeUtils.getCodecs(fullMimeType), baseMimeType);
         const fullType = MimeUtils.getFullOrConvertedType(
-            MimeUtils.getBasicType(fullMimeType), codecs, ContentType.AUDIO);
+            baseMimeType, codecs, ContentType.AUDIO);
 
         // AudioConfiguration
         audioConfigs.push({
@@ -975,9 +979,10 @@ shaka.util.StreamUtils = class {
    * Generates the correct audio codec for MediaDecodingConfiguration and
    * for MediaSource.isTypeSupported.
    * @param {string} codecs
+   * @param {string} mimeType
    * @return {string}
    */
-  static getCorrectAudioCodecs(codecs) {
+  static getCorrectAudioCodecs(codecs, mimeType) {
     // According to RFC 6381 section 3.3, 'fLaC' is actually the correct
     // codec string. We still need to map it to 'flac', as some browsers
     // currently don't support 'fLaC', while 'flac' is supported by most
@@ -992,8 +997,16 @@ shaka.util.StreamUtils = class {
     }
 
     // The same is true for 'Opus'.
-    if (codecs === 'Opus') {
-      return 'opus';
+    if (codecs.toLowerCase() === 'opus') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'opus';
+      } else {
+        if (shaka.util.MimeUtils.getContainerType(mimeType) == 'mp4') {
+          return 'Opus';
+        } else {
+          return 'opus';
+        }
+      }
     }
 
     return codecs;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [