shaka-player 3.2.6 → 3.2.9

package/karma.conf.js

@@ -363,6 +363,8 @@ module.exports = (config) => {
     // If testing custom assets, we don't serve other unit or integration tests.
     // External asset tests are the basis for custom asset testing, so this file
     // is automatically included.
+    clientArgs.testFiles.push('demo/common/asset.js');
+    clientArgs.testFiles.push('demo/common/assets.js');
     clientArgs.testFiles.push('test/player_external.js');
   } else {
     // In a normal test run, we serve unit tests.
@@ -374,6 +376,8 @@ module.exports = (config) => {
     }
     if (settings.external) {
       // If --external is present, we serve external asset tests.
+      clientArgs.testFiles.push('demo/common/asset.js');
+      clientArgs.testFiles.push('demo/common/assets.js');
       clientArgs.testFiles.push('test/**/*_external.js');
     }
   }

package/lib/abr/simple_abr_manager.js

@@ -216,8 +216,9 @@ shaka.abr.SimpleAbrManager = class {
    * @export
    */
   getBandwidthEstimate() {
+    const defaultBandwidthEstimate = this.getDefaultBandwidth_();
     return this.bandwidthEstimator_.getBandwidthEstimate(
-        this.config_.defaultBandwidthEstimate);
+        defaultBandwidthEstimate);
   }
 
 

package/lib/dash/dash_parser.js

@@ -755,8 +755,8 @@ shaka.dash.DashParser = class {
             // currently support that.  Just choose one.
             // TODO: https://github.com/shaka-project/shaka-player/issues/1528
             stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
-              shaka.util.MimeUtils.getCodecBase(stream.codecs) ==
-              shaka.util.MimeUtils.getCodecBase(trickStream.codecs));
+              shaka.util.MimeUtils.getNormalizedCodec(stream.codecs) ==
+              shaka.util.MimeUtils.getNormalizedCodec(trickStream.codecs));
           }
         }
       }
@@ -1218,7 +1218,6 @@ shaka.dash.DashParser = class {
     });
     let spatialAudio = false;
     if (hasJoc) {
-      context.representation.mimeType = 'audio/eac3-joc';
       spatialAudio = true;
     }
 

package/lib/hls/hls_parser.js

@@ -1736,8 +1736,8 @@ shaka.hls.HlsParser = class {
    * @param {number} timestampOffset
    * @param {!Map.<string, string>} variables
    * @param {string} absoluteMediaPlaylistUri
-   * @return {!shaka.media.SegmentReference}
    * @param {string} type
+   * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
@@ -1753,17 +1753,42 @@ shaka.hls.HlsParser = class {
     let startByte = 0;
     let endByte = null;
 
+    if (!extinfTag) {
+      if (hlsSegment.partialSegments.length == 0) {
+        // EXTINF tag must be available if the segment has no partial segments.
+        throw new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.MANIFEST,
+            shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING, 'EXTINF');
+      } else if (!this.lowLatencyMode_) {
+        // Without EXTINF and without low-latency mode, partial segments get
+        // ignored.
+        return null;
+      }
+    }
+
     // Create SegmentReferences for the partial segments.
     const partialSegmentRefs = [];
-    if (this.lowLatencyMode_ && hlsSegment.partialSegments.length) {
+    if (this.lowLatencyMode_) {
       for (let i = 0; i < hlsSegment.partialSegments.length; i++) {
         const item = hlsSegment.partialSegments[i];
         const pPreviousReference = i == 0 ?
           previousReference : partialSegmentRefs[partialSegmentRefs.length - 1];
         const pStartTime = (i == 0) ? startTime : pPreviousReference.endTime;
-        const pDuration = Number(item.getAttributeValue('DURATION'));
-        // A preload hinted partial segment doesn't have duration information,
-        // so its startTime and endTime are the same.
+
+        // If DURATION is missing from this partial segment, use the target
+        // partial duration from the top of the playlist, which is a required
+        // attribute for content with partial segments.
+        const pDuration = Number(item.getAttributeValue('DURATION')) ||
+            this.partialTargetDuration_;
+
+        // If for some reason we have neither an explicit duration, nor a target
+        // partial duration, we should SKIP this partial segment to avoid
+        // duplicating content in the presentation timeline.
+        if (!pDuration) {
+          continue;
+        }
+
         const pEndTime = pStartTime + pDuration;
 
         let pStartByte = 0;
@@ -1796,14 +1821,6 @@ shaka.hls.HlsParser = class {
             /* appendWindowEnd= */ Infinity);
         partialSegmentRefs.push(partial);
       } // for-loop of hlsSegment.partialSegments
-    } else {
-      // EXTINF tag must be available if the segment has no partial segments.
-      if (!extinfTag) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.MANIFEST,
-            shaka.util.Error.Code.HLS_REQUIRED_TAG_MISSING, 'EXTINF');
-      }
     }
 
     // If the segment has EXTINF tag, set the segment's end time, start byte
@@ -1822,6 +1839,7 @@ shaka.hls.HlsParser = class {
     } else {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
     }
+
     // If the segment has EXT-X-BYTERANGE tag, set the start byte and end byte
     // base on the byterange information. If segment has no EXT-X-BYTERANGE tag
     // and has partial segments, set the start byte and end byte base on the
@@ -2047,7 +2065,9 @@ shaka.hls.HlsParser = class {
             playlist.absoluteUri,
             type);
 
-        references.push(reference);
+        if (reference) {
+          references.push(reference);
+        }
       } else if (!this.lowLatencyMode_) {
         // If a segment has no extinfTag, it must contain partial segments.
         shaka.log.alwaysWarn('Low-latency HLS live stream detected, but ' +
@@ -2191,6 +2211,9 @@ shaka.hls.HlsParser = class {
         variables,
         /* absoluteMediaPlaylistUri= */ '',
         type);
+    goog.asserts.assert(
+        segmentRef != null, 'Segment reference should not be null!');
+
     // If we are updating the manifest, we can usually skip fetching the segment
     // by examining the references we already have.  This won't be possible if
     // there was some kind of lag or delay updating the manifest on the server,
@@ -2539,12 +2562,16 @@ shaka.hls.HlsParser = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
 
+    // If you wait long enough, requesting the first segment can fail
+    // because it has fallen off the left edge of DVR, so to be safer,
+    // let's request the middle segment.
     goog.asserts.assert(playlist.segments.length,
         'Playlist should have segments!');
-    const firstSegmentUri = this.variableSubstitution_(
-        playlist.segments[0].absoluteUri, variables);
+    const middleSegmentIdx = Math.trunc((playlist.segments.length - 1) / 2);
+    const middleSegmentUri = this.variableSubstitution_(
+        playlist.segments[middleSegmentIdx].absoluteUri, variables);
 
-    const parsedUri = new goog.Uri(firstSegmentUri);
+    const parsedUri = new goog.Uri(middleSegmentUri);
     const extension = parsedUri.getPath().split('.').pop();
     const map = HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_[contentType];
 
@@ -2575,7 +2602,7 @@ shaka.hls.HlsParser = class {
     // If unable to guess mime type, request a segment and try getting it
     // from the response.
     const headRequest = shaka.net.NetworkingEngine.makeRequest(
-        [firstSegmentUri], this.config_.retryParameters);
+        [middleSegmentUri], this.config_.retryParameters);
     headRequest.method = 'HEAD';
 
     const response = await this.makeNetworkRequest_(

package/lib/media/drm_engine.js

@@ -1372,6 +1372,9 @@ shaka.media.DrmEngine = class {
       }
       return;
     }
+    if (this.destroyer_.destroyed()) {
+      return;
+    }
 
     const updateEvent = new shaka.util.FakeEvent('drmsessionupdate');
     this.playerInterface_.onEvent(updateEvent);

package/lib/media/media_source_engine.js

@@ -63,6 +63,11 @@ shaka.media.MediaSourceEngine = class {
                            string>} */
     this.sourceBufferTypes_ = {};
 
+
+    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
+                           boolean>} */
+    this.expectedEncryption_ = {};
+
     /** @private {shaka.text.TextEngine} */
     this.textEngine_ = null;
 
@@ -345,6 +350,7 @@ shaka.media.MediaSourceEngine = class {
         this.sourceBuffers_[contentType] = sourceBuffer;
         this.sourceBufferTypes_[contentType] = mimeType;
         this.queues_[contentType] = [];
+        this.expectedEncryption_[contentType] = !!stream.drmInfos.length;
       }
     }
   }
@@ -1091,7 +1097,7 @@ shaka.media.MediaSourceEngine = class {
    */
   workAroundBrokenPlatforms_(segment, startTime, contentType) {
     const isInitSegment = startTime == null;
-    const encryptionExpected = this.video_.mediaKeys;
+    const encryptionExpected = this.expectedEncryption_[contentType];
 
     // If:
     //   1. this is an init segment,

package/lib/offline/indexeddb/storage_mechanism.js

@@ -368,8 +368,10 @@ shaka.offline.indexeddb.StorageMechanism.SESSION_ID_STORE = 'session-ids';
 shaka.offline.StorageMuxer.register(
     'idb',
     () => {
-      // Offline storage is not supported on the Chromecast platform.
-      if (shaka.util.Platform.isChromecast()) {
+      // Offline storage is not supported on the Chromecast or Xbox One
+      // platforms.
+      if (shaka.util.Platform.isChromecast() ||
+          shaka.util.Platform.isXboxOne()) {
         return null;
       }
       // Offline storage requires the IndexedDB API.