shaka-player 4.7.12 → 4.7.13

package/lib/mss/mss_parser.js

@@ -19,6 +19,7 @@ goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4Generator');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Timer');
@@ -556,6 +557,7 @@ shaka.mss.MssParser = class {
       accessibilityPurpose: null,
       external: false,
       fastSwitching: false,
+      fullMimeTypes: new Set(),
     };
 
     // This is specifically for text tracks.
@@ -634,6 +636,8 @@ shaka.mss.MssParser = class {
         }
         break;
     }
+    stream.fullMimeTypes.add(shaka.util.MimeUtils.getFullType(
+        stream.mimeType, stream.codecs));
 
     // Lazy-Load the segment index to avoid create all init segment at the
     // same time

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -211,6 +211,8 @@ shaka.offline.indexeddb.V1StorageCell = class
       appendWindowEnd,
       timestampOffset,
       tilesLayout: '',
+      mimeType: null,
+      codecs: null,
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -155,6 +155,8 @@ shaka.offline.indexeddb.V2StorageCell = class
       timestampOffset,
       dataKey: old.dataKey,
       tilesLayout: '',
+      mimeType: null,
+      codecs: null,
     };
   }
 };

package/lib/offline/manifest_converter.js

@@ -14,6 +14,7 @@ goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.offline.OfflineUri');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.MimeUtils');
 
 
 /**
@@ -169,7 +170,7 @@ shaka.offline.ManifestConverter = class {
   fromStreamDB_(streamDB, timeline) {
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const segments = streamDB.segments.map(
-        (segment, index) => this.fromSegmentDB_(index, segment));
+        (segment, index) => this.fromSegmentDB_(index, segment, streamDB));
 
     timeline.notifySegments(segments);
 
@@ -212,6 +213,8 @@ shaka.offline.ManifestConverter = class {
       accessibilityPurpose: null,
       external: streamDB.external,
       fastSwitching: streamDB.fastSwitching,
+      fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+          streamDB.mimeType, streamDB.codecs)]),
     };
 
     return stream;
@@ -220,10 +223,11 @@ shaka.offline.ManifestConverter = class {
   /**
    * @param {number} index
    * @param {shaka.extern.SegmentDB} segmentDB
+   * @param {shaka.extern.StreamDB} streamDB
    * @return {!shaka.media.SegmentReference}
    * @private
    */
-  fromSegmentDB_(index, segmentDB) {
+  fromSegmentDB_(index, segmentDB, streamDB) {
     /** @type {!shaka.offline.OfflineUri} */
     const uri = shaka.offline.OfflineUri.segment(
         this.mechanism_, this.cell_, segmentDB.dataKey);
@@ -231,7 +235,7 @@ shaka.offline.ManifestConverter = class {
     const initSegmentReference = segmentDB.initSegmentKey != null ?
         this.fromInitSegmentDB_(segmentDB.initSegmentKey) : null;
 
-    return new shaka.media.SegmentReference(
+    const ref = new shaka.media.SegmentReference(
         segmentDB.startTime,
         segmentDB.endTime,
         () => [uri.toString()],
@@ -243,6 +247,9 @@ shaka.offline.ManifestConverter = class {
         segmentDB.appendWindowEnd,
         /* partialReferences= */ [],
         segmentDB.tilesLayout || '');
+    ref.mimeType = segmentDB.mimeType || streamDB.mimeType || '';
+    ref.codecs = segmentDB.codecs || streamDB.codecs || '';
+    return ref;
   }
 
   /**

package/lib/offline/storage.js

@@ -1389,6 +1389,8 @@ shaka.offline.Storage = class {
         tilesLayout: segment.tilesLayout,
         pendingSegmentRefId,
         dataKey: 0,
+        mimeType: segment.mimeType,
+        codecs: segment.codecs,
       };
       streamDb.segments.push(segmentDB);
       groupId = (groupId + 1) % numberOfParallelDownloads;

package/lib/player.js

@@ -2174,12 +2174,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         accessibilityPurpose: null,
         external: false,
         fastSwitching: false,
+        fullMimeTypes: new Set(),
       },
       bandwidth: 100,
       allowedByApplication: true,
       allowedByKeySystem: true,
       decodingInfos: [],
     };
+    variant.video.fullMimeTypes.add(shaka.util.MimeUtils.getFullType(
+        variant.video.mimeType, variant.video.codecs));
 
     this.drmEngine_.setSrcEquals(/* srcEquals= */ true);
     await this.drmEngine_.initForPlayback(
@@ -3620,12 +3623,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         const currentTime = this.video_.currentTime;
         const seekRange = this.seekRange();
         const safeSeekOffset = this.config_.streaming.safeSeekOffset;
+
+        // Cancel trick play if we hit the beginning or end of the seekable
+        // (Sub-second accuracy not required here)
         if (rate > 0) {
-          if (currentTime >= seekRange.end) {
+          if (Math.floor(currentTime) >= Math.floor(seekRange.end)) {
             this.cancelTrickPlay();
           }
         } else {
-          if (currentTime <= (seekRange.start + safeSeekOffset)) {
+          if (Math.floor(currentTime) <=
+              Math.floor(seekRange.start + safeSeekOffset)) {
             this.cancelTrickPlay();
           }
         }
@@ -4804,6 +4811,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       accessibilityPurpose: null,
       external: true,
       fastSwitching: false,
+      fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+          mimeType || '', codec || '')]),
     };
 
     const fullMimeType = shaka.util.MimeUtils.getFullType(
@@ -4960,6 +4969,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       accessibilityPurpose: null,
       external: true,
       fastSwitching: false,
+      fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+          mimeType || '', '')]),
     };
 
     if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
@@ -5390,6 +5401,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               accessibilityPurpose: null,
               external: false,
               fastSwitching: false,
+              fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+                  mimeType, '')]),
             };
             manifest.textStreams.push(textStream);
             closedCaptionsSet.add(id);
@@ -6947,7 +6960,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.12' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.13' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/mime_utils.js

@@ -84,17 +84,22 @@ shaka.util.MimeUtils = class {
    * beyond the container and codec type, when available.
    *
    * @param {shaka.extern.Stream} stream
+   * @param {string} mimeType
+   * @param {string} codecs
    * @return {string}
    */
-  static getExtendedType(stream) {
-    const components = [stream.mimeType];
+  static getExtendedType(stream, mimeType, codecs) {
+    const components = [mimeType];
 
     const extendedMimeParams = shaka.util.MimeUtils.EXTENDED_MIME_PARAMETERS_;
     extendedMimeParams.forEach((mimeKey, streamKey) => {
       const value = stream[streamKey];
-      if (streamKey == 'codecs' &&
-          shaka.util.MimeUtils.RAW_FORMATS.includes(stream.mimeType)) {
-        // Skip codecs for raw formats
+      if (streamKey == 'codecs') {
+        if (shaka.util.MimeUtils.RAW_FORMATS.includes(stream.mimeType)) {
+          // Skip codecs for raw formats
+        } else {
+          components.push('codecs="' + codecs + '"');
+        }
       } else if (value) {
         components.push(mimeKey + '="' + value + '"');
       }

package/lib/util/periods.js

@@ -599,14 +599,6 @@ shaka.util.PeriodCombiner = class {
         goog.asserts.assert(match.segmentIndex,
             'stream should have a segmentIndex.');
         if (match.segmentIndex) {
-          match.segmentIndex.forEachTopLevelReference((ref) => {
-            ref.codecs = match.codecs;
-            ref.mimeType = match.mimeType;
-            if (ref.initSegmentReference) {
-              ref.initSegmentReference.codecs = match.codecs;
-              ref.initSegmentReference.mimeType = match.mimeType;
-            }
-          });
           outputStream.segmentIndex.appendSegmentIndex(match.segmentIndex);
         }
       }
@@ -721,39 +713,14 @@ shaka.util.PeriodCombiner = class {
 
       if (used) {
         unusedStreamsPerPeriod[i].delete(match);
-        // Add the codec of this stream to the output stream's codecs.
-        const codecs = new Set(outputStream.codecs.split(','));
-        for (const codec of match.codecs.split(',')) {
-          if (codec) {
-            codecs.add(codec);
+        // Add the full mimetypes to the stream.
+        if (match.fullMimeTypes) {
+          for (const fullMimeType of match.fullMimeTypes.values()) {
+            outputStream.fullMimeTypes.add(fullMimeType);
           }
         }
-        const PeriodCombiner = shaka.util.PeriodCombiner;
-        outputStream.codecs = PeriodCombiner.filterDuplicateCodecs_(
-            Array.from(codecs)).join(',');
-      }
-    }
-  }
-
-  /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
-   * @private
-   */
-  static filterDuplicateCodecs_(codecs) {
-    // Filter out duplicate codecs.
-    const seen = new Set();
-    const ret = [];
-    for (const codec of codecs) {
-      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
-      if (!seen.has(shortCodec)) {
-        ret.push(codec);
-        seen.add(shortCodec);
-      } else {
-        shaka.log.debug('Ignoring duplicate codec');
       }
     }
-    return ret;
   }
 
   /**
@@ -1578,6 +1545,7 @@ shaka.util.PeriodCombiner = class {
       accessibilityPurpose: null,
       external: false,
       fastSwitching: false,
+      fullMimeTypes: new Set(),
     };
   }