shaka-player 4.6.0 → 4.6.1

package/lib/dash/dash_parser.js

@@ -285,7 +285,8 @@ shaka.dash.DashParser = class {
 
     // For redirections add the response uri to the first entry in the
     // Manifest Uris array.
-    if (response.uri && !this.manifestUris_.includes(response.uri)) {
+    if (response.uri && response.uri != response.originalUri &&
+        !this.manifestUris_.includes(response.uri)) {
       this.manifestUris_.unshift(response.uri);
     }
 
@@ -373,19 +374,16 @@ shaka.dash.DashParser = class {
 
     const contentSteering = XmlUtils.findChild(mpd, 'ContentSteering');
     if (contentSteering && this.playerInterface_) {
-      const hasPrevContentSteeringManager = !!this.contentSteeringManager_;
+      const defaultPathwayId =
+          contentSteering.getAttribute('defaultServiceLocation');
       if (!this.contentSteeringManager_) {
         this.contentSteeringManager_ =
             new shaka.util.ContentSteeringManager(this.playerInterface_);
-      }
-      this.contentSteeringManager_.configure(this.config_);
-      this.contentSteeringManager_.setBaseUris(manifestBaseUris);
-      this.contentSteeringManager_.setManifestType(
-          shaka.media.ManifestParser.DASH);
-      const defaultPathwayId =
-          contentSteering.getAttribute('defaultServiceLocation');
-      this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
-      if (!hasPrevContentSteeringManager) {
+        this.contentSteeringManager_.configure(this.config_);
+        this.contentSteeringManager_.setManifestType(
+            shaka.media.ManifestParser.DASH);
+        this.contentSteeringManager_.setBaseUris(manifestBaseUris);
+        this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
         const uri = XmlUtils.getContents(contentSteering);
         if (uri) {
           const queryBeforeStart =
@@ -398,6 +396,9 @@ shaka.dash.DashParser = class {
             this.contentSteeringManager_.requestInfo(uri);
           }
         }
+      } else {
+        this.contentSteeringManager_.setBaseUris(manifestBaseUris);
+        this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
       }
     }
 

package/lib/dash/segment_template.js

@@ -141,7 +141,8 @@ shaka.dash.SegmentTemplate = class {
         );
       } else {
         const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
-        tsi.appendTemplateInfo(info, periodStart, periodEnd, shouldFit);
+        tsi.appendTemplateInfo(
+            info, periodStart, periodEnd, shouldFit, initSegmentReference);
 
         const availabilityStart =
           context.presentationTimeline.getSegmentAvailabilityStart();
@@ -167,7 +168,7 @@ shaka.dash.SegmentTemplate = class {
           if (segmentIndex instanceof shaka.dash.TimelineSegmentIndex &&
               segmentIndex.isEmpty()) {
             segmentIndex.appendTemplateInfo(info, periodStart,
-                periodEnd, shouldFit);
+                periodEnd, shouldFit, initSegmentReference);
           }
           return Promise.resolve(segmentIndex);
         },
@@ -684,8 +685,11 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} periodStart
    * @param {number} periodEnd
    * @param {boolean} shouldFit
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
    */
-  appendTemplateInfo(info, periodStart, periodEnd, shouldFit) {
+  appendTemplateInfo(info, periodStart, periodEnd, shouldFit,
+      initSegmentReference) {
+    this.initSegmentReference_ = initSegmentReference;
     if (!this.templateInfo_) {
       this.templateInfo_ = info;
       this.periodStart_ = periodStart;
@@ -693,6 +697,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     } else {
       const currentTimeline = this.templateInfo_.timeline;
 
+      this.templateInfo_.mediaTemplate = info.mediaTemplate;
+
       // Append timeline
       const lastCurrentEntry = currentTimeline[currentTimeline.length - 1];
       const newEntries = info.timeline.filter((entry) => {

package/lib/hls/hls_parser.js

@@ -1672,9 +1672,15 @@ shaka.hls.HlsParser = class {
     // the value NONE. If the value is a quoted-string, it MUST match the
     // value of the GROUP-ID attribute of an EXT-X-MEDIA tag elsewhere in the
     // Playlist whose TYPE attribute is CLOSED-CAPTIONS.
-    if (type == ContentType.VIDEO && closedCaptionsAttr &&
-    closedCaptionsAttr != 'NONE') {
-      return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+    if (type == ContentType.VIDEO) {
+      if (closedCaptionsAttr && closedCaptionsAttr != 'NONE') {
+        return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+      } else if (!closedCaptionsAttr &&
+          this.groupIdToClosedCaptionsMap_.size) {
+        for (const key of this.groupIdToClosedCaptionsMap_.keys()) {
+          return this.groupIdToClosedCaptionsMap_.get(key);
+        }
+      }
     }
     return null;
   }

package/lib/media/streaming_engine.js

@@ -1351,6 +1351,7 @@ shaka.media.StreamingEngine = class {
         let remaining = new Uint8Array(0);
         let processingResult = false;
         let callbackCalled = false;
+        let streamDataCallbackError;
         const streamDataCallback = async (data) => {
           if (processingResult) {
             // If the fallback result processing was triggered, don't also
@@ -1363,40 +1364,47 @@ shaka.media.StreamingEngine = class {
           if (this.fatalError_) {
             return;
           }
-          // Append the data with complete boxes.
-          // Every time streamDataCallback gets called, append the new data to
-          // the remaining data.
-          // Find the last fully completed Mdat box, and slice the data into two
-          // parts: the first part with completed Mdat boxes, and the second
-          // part with an incomplete box.
-          // Append the first part, and save the second part as remaining data,
-          // and handle it with the next streamDataCallback call.
-          remaining = this.concatArray_(remaining, data);
-          let sawMDAT = false;
-          let offset = 0;
-          new shaka.util.Mp4Parser()
-              .box('mdat', (box) => {
-                offset = box.size + box.start;
-                sawMDAT = true;
-              })
-              .parse(remaining, /* partialOkay= */ false,
+          try {
+            // Append the data with complete boxes.
+            // Every time streamDataCallback gets called, append the new data
+            // to the remaining data.
+            // Find the last fully completed Mdat box, and slice the data into
+            // two parts: the first part with completed Mdat boxes, and the
+            // second part with an incomplete box.
+            // Append the first part, and save the second part as remaining
+            // data, and handle it with the next streamDataCallback call.
+            remaining = this.concatArray_(remaining, data);
+            let sawMDAT = false;
+            let offset = 0;
+            new shaka.util.Mp4Parser()
+                .box('mdat', (box) => {
+                  offset = box.size + box.start;
+                  sawMDAT = true;
+                })
+                .parse(remaining, /* partialOkay= */ false,
+                    /* isChunkedData= */ true);
+            if (sawMDAT) {
+              const dataToAppend = remaining.subarray(0, offset);
+              remaining = remaining.subarray(offset);
+              await this.append_(
+                  mediaState, presentationTime, stream, reference, dataToAppend,
                   /* isChunkedData= */ true);
-          if (sawMDAT) {
-            const dataToAppend = remaining.subarray(0, offset);
-            remaining = remaining.subarray(offset);
-            await this.append_(
-                mediaState, presentationTime, stream, reference, dataToAppend,
-                /* isChunkedData= */ true);
-
-            if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
-              mediaState.segmentPrefetch.prefetchSegments(
-                  reference, /* skipFirst= */ true);
+
+              if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
+                mediaState.segmentPrefetch.prefetchSegments(
+                    reference, /* skipFirst= */ true);
+              }
             }
+          } catch (error) {
+            streamDataCallbackError = error;
           }
         };
 
         const result =
             await this.fetch_(mediaState, reference, streamDataCallback);
+        if (streamDataCallbackError) {
+          throw streamDataCallbackError;
+        }
         if (!callbackCalled) {
           // In some environments, we might be forced to use network plugins
           // that don't support streamDataCallback. In those cases, as a

package/lib/player.js

@@ -4595,9 +4595,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
       await this.addSrcTrackElement_(uri, language, kind, mimeType, label || '',
           adCuePoints);
+
+      const LanguageUtils = shaka.util.LanguageUtils;
+      const languageNormalized = LanguageUtils.normalize(language);
+
       const textTracks = this.getTextTracks();
       const srcTrack = textTracks.find((t) => {
-        return t.language == language &&
+        return LanguageUtils.normalize(t.language) == languageNormalized &&
             t.label == (label || '') &&
             t.kind == kind;
       });
@@ -6777,7 +6781,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.1' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/package.json

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

package/test/hls/hls_parser_unit.js

@@ -750,6 +750,46 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('parses audio+video variant with global closed captions', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",CHANNELS="2",',
+      'URI="audio"\n',
+      '#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID="cap1",LANGUAGE="eng",',
+      'INSTREAM-ID="CC1"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
+      'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
+      'video\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    const closedCaptions = new Map([['CC1', 'en']]);
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.closedCaptions = closedCaptions;
+          stream.mime('video/mp4', 'avc1');
+        });
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'mp4a');
+        });
+      });
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with no closed captions', async () => {
     const master = [
       '#EXTM3U\n',