shaka-player 3.1.1 → 3.1.5

package/lib/util/periods.js

@@ -80,7 +80,10 @@ shaka.util.PeriodCombiner = class {
 
   /** @return {!Array.<shaka.extern.Stream>} */
   getTextStreams() {
-    return this.textStreams_;
+    // Return a copy of the array because makeTextStreamsForClosedCaptions
+    // may make changes to the contents of the array. Those changes should not
+    // propagate back to the PeriodCombiner.
+    return this.textStreams_.slice();
   }
 
   /** @return {!Array.<shaka.extern.Stream>} */
@@ -100,6 +103,7 @@ shaka.util.PeriodCombiner = class {
     shaka.util.PeriodCombiner.filterOutAudioStreamDuplicates_(periods);
     shaka.util.PeriodCombiner.filterOutVideoStreamDuplicates_(periods);
     shaka.util.PeriodCombiner.filterOutTextStreamDuplicates_(periods);
+    shaka.util.PeriodCombiner.filterOutImageStreamDuplicates_(periods);
 
     // Optimization: for single-period VOD, do nothing.  This makes sure
     // single-period DASH content will be 100% accurately represented in the
@@ -142,12 +146,18 @@ shaka.util.PeriodCombiner = class {
       const imageStreamsPerPeriod = periods.map(
           (period) => period.imageStreams);
 
-      // It's okay to have a period with no text, but our algorithm fails on any
-      // period without matching streams.  So we add dummy text streams to each
-      // period.  Since we combine text streams by language, we might need a
-      // dummy even in periods with text streams already.
+      // It's okay to have a period with no text or images, but our algorithm
+      // fails on any period without matching streams.  So we add dummy streams
+      // to each period.  Since we combine text streams by language and image
+      // streams by resolution, we might need a dummy even in periods with these
+      // streams already.
       for (const textStreams of textStreamsPerPeriod) {
-        textStreams.push(shaka.util.PeriodCombiner.dummyTextStream_());
+        textStreams.push(shaka.util.PeriodCombiner.dummyStream_(
+            ContentType.TEXT));
+      }
+      for (const imageStreams of imageStreamsPerPeriod) {
+        imageStreams.push(shaka.util.PeriodCombiner.dummyStream_(
+            ContentType.IMAGE));
       }
 
       await shaka.util.PeriodCombiner.combine_(
@@ -342,6 +352,36 @@ shaka.util.PeriodCombiner = class {
     }
   }
 
+  /**
+   * @param {!Array.<shaka.util.PeriodCombiner.Period>} periods
+   * @private
+   */
+  static filterOutImageStreamDuplicates_(periods) {
+    // Two image streams are considered to be duplicates of
+    // one another if their ids are different, but all the other
+    // information is the same.
+    for (const period of periods) {
+      const filteredImages = [];
+      for (const i1 of period.imageStreams) {
+        let duplicate = false;
+        for (const i2 of filteredImages) {
+          if (i1.id != i2.id &&
+              i1.width == i2.width &&
+              i1.codecs == i2.codecs &&
+              i1.mimeType == i2.mimeType) {
+            duplicate = true;
+          }
+        }
+
+        if (!duplicate) {
+          filteredImages.push(i1);
+        }
+      }
+
+      period.imageStreams = filteredImages;
+    }
+  }
+
   /**
    * Stitch together DB streams across periods, taking a mix of stream types.
    * The offline database does not separate these by type.
@@ -368,13 +408,21 @@ shaka.util.PeriodCombiner = class {
         (streams) => streams.filter((s) => s.type == ContentType.VIDEO));
     const textStreamDbsPerPeriod = streamDbsPerPeriod.map(
         (streams) => streams.filter((s) => s.type == ContentType.TEXT));
-
-    // It's okay to have a period with no text, but our algorithm fails on any
-    // period without matching streams.  So we add dummy text streams to each
-    // period.  Since we combine text streams by language, we might need a
-    // dummy even in periods with text streams already.
+    const imageStreamDbsPerPeriod = streamDbsPerPeriod.map(
+        (streams) => streams.filter((s) => s.type == ContentType.IMAGE));
+
+    // It's okay to have a period with no text or images, but our algorithm
+    // fails on any period without matching streams.  So we add dummy streams to
+    // each period.  Since we combine text streams by language and image streams
+    // by resolution, we might need a dummy even in periods with these streams
+    // already.
     for (const textStreams of textStreamDbsPerPeriod) {
-      textStreams.push(shaka.util.PeriodCombiner.dummyTextStreamDB_());
+      textStreams.push(shaka.util.PeriodCombiner.dummyStreamDB_(
+          ContentType.TEXT));
+    }
+    for (const imageStreams of imageStreamDbsPerPeriod) {
+      imageStreams.push(shaka.util.PeriodCombiner.dummyStreamDB_(
+          ContentType.IMAGE));
     }
 
     const combinedAudioStreamDbs = await shaka.util.PeriodCombiner.combine_(
@@ -398,6 +446,13 @@ shaka.util.PeriodCombiner = class {
         shaka.util.PeriodCombiner.cloneStreamDB_,
         shaka.util.PeriodCombiner.concatenateStreamDBs_);
 
+    const combinedImageStreamDbs = await shaka.util.PeriodCombiner.combine_(
+        /* outputStreams= */ [],
+        imageStreamDbsPerPeriod,
+        /* firstNewPeriodIndex= */ 0,
+        shaka.util.PeriodCombiner.cloneStreamDB_,
+        shaka.util.PeriodCombiner.concatenateStreamDBs_);
+
     // Recreate variantIds from scratch in the output.
     // HLS content is always single-period, so the early return at the top of
     // this method would catch all HLS content.  DASH content stored with v3.0
@@ -426,7 +481,8 @@ shaka.util.PeriodCombiner = class {
 
     return combinedVideoStreamDbs
         .concat(combinedAudioStreamDbs)
-        .concat(combinedTextStreamDbs);
+        .concat(combinedTextStreamDbs)
+        .concat(combinedImageStreamDbs);
   }
 
   /**
@@ -506,9 +562,12 @@ shaka.util.PeriodCombiner = class {
 
     for (const unusedStreams of unusedStreamsPerPeriod) {
       for (const stream of unusedStreams) {
-        if (stream.type == ContentType.TEXT && !stream.language) {
-          // This is one of our dummy text streams, so ignore it.  We may not
-          // use them all, and that's fine.
+        const isDummyText = stream.type == ContentType.TEXT && !stream.language;
+        const isDummyImage = stream.type == ContentType.IMAGE &&
+            !stream.tilesLayout;
+        if (isDummyText || isDummyImage) {
+          // This is one of our dummy streams, so ignore it.  We may not use
+          // them all, and that's fine.
           continue;
         }
         // If this stream has a different codec/MIME than any other stream,
@@ -525,6 +584,8 @@ shaka.util.PeriodCombiner = class {
 
         // Any other unused stream is likely a bug in our algorithm, so throw
         // an error.
+        shaka.log.error('Unused stream in period-flattening!',
+            stream, outputStreams);
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MANIFEST,
@@ -563,6 +624,8 @@ shaka.util.PeriodCombiner = class {
 
     if (!matches) {
       // We were unable to extend this output stream.
+      shaka.log.error('No matches extending output stream!',
+          outputStream, streamsPerPeriod);
       return false;
     }
 
@@ -1066,7 +1129,7 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
-    // Otherwise, compare the streams' characteristics to detecrmine the best
+    // Otherwise, compare the streams' characteristics to determine the best
     // match.
 
     // The most important thing is language.  In some cases, we will accept a
@@ -1164,6 +1227,7 @@ shaka.util.PeriodCombiner = class {
       }
     }
 
+    // If the result of each comparison was inconclusive, default to false.
     return false;
   }
 
@@ -1188,7 +1252,7 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
-    // Otherwise, compare the streams' characteristics to detecrmine the best
+    // Otherwise, compare the streams' characteristics to determine the best
     // match.
 
     // Take the video with the closest resolution to the output.
@@ -1234,6 +1298,7 @@ shaka.util.PeriodCombiner = class {
       }
     }
 
+    // If the result of each comparison was inconclusive, default to false.
     return false;
   }
 
@@ -1258,7 +1323,7 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
-    // Otherwise, compare the streams' characteristics to detecrmine the best
+    // Otherwise, compare the streams' characteristics to determine the best
     // match.
 
     // The most important thing is language.  In some cases, we will accept a
@@ -1319,6 +1384,7 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
+    // If the result of each comparison was inconclusive, default to false.
     return false;
   }
 
@@ -1334,6 +1400,8 @@ shaka.util.PeriodCombiner = class {
    * @private
    */
   static isImageStreamBetterMatch_(outputStream, best, candidate) {
+    const {BETTER, EQUAL, WORSE} = shaka.util.PeriodCombiner.BetterOrWorse;
+
     // If the output stream was based on the candidate stream, the candidate
     // stream should be considered a better match. We can check this by
     // comparing their ids.
@@ -1341,31 +1409,38 @@ shaka.util.PeriodCombiner = class {
       return true;
     }
 
-    // If the candidate has the same MIME type, upgrade to the
-    // candidate.  It's not required that image streams use the same format
-    // across periods, but it's a helpful signal.
-    if (candidate.mimeType == outputStream.mimeType) {
+    // Take the image with the closest resolution to the output.
+    const resolutionBetterOrWorse =
+        shaka.util.PeriodCombiner.compareClosestPreferLower(
+            outputStream.width * outputStream.height,
+            best.width * best.height,
+            candidate.width * candidate.height);
+    if (resolutionBetterOrWorse == BETTER) {
       return true;
+    } else if (resolutionBetterOrWorse == WORSE) {
+      return false;
     }
 
+    // If the result of each comparison was inconclusive, default to false.
     return false;
   }
 
   /**
-   * Create a dummy text StreamDB to fill in periods with no text, to avoid
-   * failing the general flattening algorithm.
+   * Create a dummy StreamDB to fill in periods that are missing a certain type,
+   * to avoid failing the general flattening algorithm.  This won't be used for
+   * audio or video, since those are strictly required in all periods if they
+   * exist in any period.
    *
+   * @param {shaka.util.ManifestParserUtils.ContentType} type
    * @return {shaka.extern.StreamDB}
    * @private
    */
-  static dummyTextStreamDB_() {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
+  static dummyStreamDB_(type) {
     return {
       id: 0,
       originalId: '',
       primary: false,
-      type: ContentType.TEXT,
+      type,
       mimeType: '',
       codecs: '',
       language: '',
@@ -1386,15 +1461,16 @@ shaka.util.PeriodCombiner = class {
   }
 
   /**
-   * Create a dummy text Stream to fill in periods with no text, to avoid
-   * failing the general flattening algorithm.
+   * Create a dummy Stream to fill in periods that are missing a certain type,
+   * to avoid failing the general flattening algorithm.  This won't be used for
+   * audio or video, since those are strictly required in all periods if they
+   * exist in any period.
    *
+   * @param {shaka.util.ManifestParserUtils.ContentType} type
    * @return {shaka.extern.Stream}
    * @private
    */
-  static dummyTextStream_() {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
+  static dummyStream_(type) {
     return {
       id: 0,
       originalId: '',
@@ -1407,7 +1483,7 @@ shaka.util.PeriodCombiner = class {
       keyIds: new Set(),
       language: '',
       label: null,
-      type: ContentType.TEXT,
+      type,
       primary: false,
       trickModeVideo: null,
       emsgSchemeIdUris: null,

package/lib/util/platform.js

@@ -163,7 +163,6 @@ shaka.util.Platform = class {
            !shaka.util.Platform.isEdge();
   }
 
-
   /**
    * Check if the current platform is from Apple.
    *
@@ -179,6 +178,19 @@ shaka.util.Platform = class {
             && !shaka.util.Platform.isTizen();
   }
 
+  /**
+   * Check if the current platform is Playstation 5.
+   *
+   * Returns true on Playstation 5 browsers.
+   *
+   * Returns false for Playstation 5 browsers
+   *
+   * @return {boolean}
+   */
+  static isPS5() {
+    return shaka.util.Platform.userAgentContains_('PlayStation 5');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *

package/lib/util/stream_utils.js

@@ -315,7 +315,9 @@ shaka.util.StreamUtils = class {
               variant);
           return false;
         }
+        return true;
       }
+
       shaka.log.debug('DrmEngine is not initialized yet.');
       return true;
     });
@@ -335,9 +337,44 @@ shaka.util.StreamUtils = class {
         'MediaCapabilities should be valid.');
 
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
-        manifest.variants, usePersistentLicenses);
+        manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
     manifest.variants = manifest.variants.filter((variant) => {
+      // See: https://github.com/google/shaka-player/issues/3860
       const video = variant.video;
+      const ContentType = shaka.util.ManifestParserUtils.ContentType;
+      if (video) {
+        let videoCodecs = shaka.util.StreamUtils.patchVp9(video.codecs);
+        // For multiplexed streams. Here we must check the audio of the
+        // stream to see if it is compatible.
+        if (video.codecs.includes(',')) {
+          const allCodecs = video.codecs.split(',');
+          videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.VIDEO, allCodecs);
+          const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.AUDIO, allCodecs);
+          const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
+              video.mimeType, audioCodecs, ContentType.AUDIO);
+          if (!MediaSource.isTypeSupported(audioFullType)) {
+            return false;
+          }
+        }
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            video.mimeType, videoCodecs, ContentType.VIDEO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+      const audio = variant.audio;
+      if (audio) {
+        const codecs =
+            shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            audio.mimeType, codecs, ContentType.AUDIO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+
       // See: https://github.com/google/shaka-player/issues/3380
       if (shaka.util.Platform.isXboxOne() && video &&
           ((video.width && video.width > 1920) ||
@@ -408,9 +445,11 @@ shaka.util.StreamUtils = class {
    *
    * @param {!Array.<shaka.extern.Variant>} variants
    * @param {boolean} usePersistentLicenses
+   * @param {boolean} srcEquals
    * @exportDoc
    */
-  static async getDecodingInfosForVariants(variants, usePersistentLicenses) {
+  static async getDecodingInfosForVariants(variants, usePersistentLicenses,
+      srcEquals) {
     const gotDecodingInfo = variants.some((variant) =>
       variant.decodingInfos.length);
     if (gotDecodingInfo) {
@@ -434,7 +473,7 @@ shaka.util.StreamUtils = class {
     for (const variant of variants) {
       /** @type {!Array.<!MediaDecodingConfiguration>} */
       const decodingConfigs = shaka.util.StreamUtils.getDecodingConfigs_(
-          variant, usePersistentLicenses);
+          variant, usePersistentLicenses, srcEquals);
 
       for (const config of decodingConfigs) {
         operations.push(getVariantDecodingInfos(variant, config));
@@ -449,17 +488,18 @@ shaka.util.StreamUtils = class {
    * results for each variant.
    * @param {!shaka.extern.Variant} variant
    * @param {boolean} usePersistentLicenses
+   * @param {boolean} srcEquals
    * @return {!Array.<!MediaDecodingConfiguration>}
    * @private
    */
-  static getDecodingConfigs_(variant, usePersistentLicenses) {
+  static getDecodingConfigs_(variant, usePersistentLicenses, srcEquals) {
     const audio = variant.audio;
     const video = variant.video;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     /** @type {!MediaDecodingConfiguration} */
     const mediaDecodingConfig = {
-      type: 'media-source',
+      type: srcEquals ? 'file' : 'media-source',
     };
 
     if (video) {
@@ -496,14 +536,23 @@ shaka.util.StreamUtils = class {
         // framerate must be greater than 0, otherwise the config is invalid.
         framerate: video.frameRate || 1,
       };
+      if (video.hdr) {
+        switch (video.hdr) {
+          case 'SDR':
+            mediaDecodingConfig.video.transferFunction = 'srgb';
+            break;
+          case 'PQ':
+            mediaDecodingConfig.video.transferFunction = 'pq';
+            break;
+          case 'HLG':
+            mediaDecodingConfig.video.transferFunction = 'hlg';
+            break;
+        }
+      }
     }
     if (audio) {
-      // Some Tizen devices seem to misreport AC-3 support, but correctly
-      // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-      // See https://github.com/google/shaka-player/issues/2989 for details.
       const codecs =
-          (audio.codecs.toLowerCase() == 'ac-3' &&
-          shaka.util.Platform.isTizen()) ? 'ec-3' : audio.codecs;
+          shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
       const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
@@ -614,6 +663,26 @@ shaka.util.StreamUtils = class {
     return configs;
   }
 
+
+  /**
+   * Generates the correct audio codec for MediaDecodingConfiguration and
+   * for MediaSource.isTypeSupported.
+   * @param {string} codecs
+   * @return {string}
+   * @private
+   */
+  static getCorrectAudioCodecs_(codecs) {
+    // Some Tizen devices seem to misreport AC-3 support, but correctly
+    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
+    // See https://github.com/google/shaka-player/issues/2989 for details.
+    if (shaka.util.Platform.isTizen()) {
+      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
+    } else {
+      return codecs;
+    }
+  }
+
+
   /**
    * MediaCapabilities supports 'vp09...' codecs, but not 'vp9'. Translate vp9
    * codec strings into 'vp09...', to allow such content to play with

package/lib/util/xml_utils.js

@@ -102,6 +102,25 @@ shaka.util.XmlUtils = class {
   }
 
 
+  /**
+   * Gets a namespace-qualified attribute.
+   * @param {!Element} elem The element to get from.
+   * @param {!Array.<string>} nsList The lis of namespace URIs.
+   * @param {string} name The local name of the attribute.
+   * @return {?string} The attribute's value, or null if not present.
+   */
+  static getAttributeNSList(elem, nsList, name) {
+    // Some browsers return the empty string when the attribute is missing,
+    // so check if it exists first.  See: https://mzl.la/2L7F0UK
+    for (const ns of nsList) {
+      if (elem.hasAttributeNS(ns, name)) {
+        return elem.getAttributeNS(ns, name);
+      }
+    }
+    return null;
+  }
+
+
   /**
    * Gets the text contents of a node.
    * @param {!Node} elem The XML element.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.1.1",
+  "version": "3.1.5",
   "homepage": "https://github.com/google/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -12,6 +12,7 @@
   ],
   "devDependencies": {
     "@chiragrupani/karma-chromium-edge-launcher": "^2.1.0",
+    "@onslip/karma-safari-launcher": "^1.0.1",
     "@teppeis/clutz": "^1.0.29-4c95e12.v20190929",
     "awesomplete": "^1.1.4",
     "babel-core": "^6.26.3",
@@ -44,7 +45,6 @@
     "karma-jasmine": "^3.3.1",
     "karma-jasmine-ajax": "^0.1.13",
     "karma-opera-launcher": "^1.0.0",
-    "karma-safari-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.32",
     "karma-webdriver-launcher": "^1.0.8",

package/test/cast/cast_proxy_unit.js

@@ -297,7 +297,8 @@ describe('CastProxy', () => {
             'timeupdate', Util.spyFunc(proxyListener));
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockVideo.on['timeupdate'](fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'timeupdate',
@@ -315,7 +316,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockVideo.on['timeupdate'](fakeEvent);
         expect(proxyListener).not.toHaveBeenCalled();
       });
@@ -332,7 +334,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockSender.onRemoteEvent('video', fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'timeupdate',
@@ -446,7 +449,8 @@ describe('CastProxy', () => {
             'buffering', Util.spyFunc(proxyListener));
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockPlayer.listeners['buffering'](fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'buffering',
@@ -464,7 +468,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockPlayer.listeners['buffering'](fakeEvent);
         expect(proxyListener).not.toHaveBeenCalled();
       });
@@ -481,7 +486,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockSender.onRemoteEvent('player', fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'buffering',

package/test/cast/cast_receiver_integration.js

@@ -170,7 +170,7 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
       // Check that the update message is of a reasonable size. From previous
       // testing we found that the socket would silently reject data that got
       // too big. 6KB is safely below the limit.
-      expect(message.length).toBeLessThan(6 * 1024);
+      expect(message.length).toBeLessThan(7 * 1024);
     });
 
     drmIt('has reasonable average message size', async () => {

package/test/cast/cast_utils_unit.js

@@ -122,7 +122,7 @@ describe('CastUtils', () => {
       expect(typeof deserialized).toBe('object');
 
       // The object can be used to construct a FakeEvent.
-      const fakeEvent = new FakeEvent(deserialized['type'], deserialized);
+      const fakeEvent = FakeEvent.fromRealEvent(deserialized);
 
       // The fake event has the same type and properties as the original.
       const asObj = /** @type {!Object} */ (fakeEvent);

package/test/cea/mp4_cea_parser_unit.js

@@ -27,6 +27,32 @@ describe('Mp4CeaParser', () => {
     ceaSegment = responses[1];
   });
 
+  /**
+   * Test only the functionality of removing EPB
+   * Expect removeEmu() to return the NALU with correct length
+   *
+   * Chromium VDA has a strict standard on NALU length
+   * It will complain about conformance if the array is malformed
+   *
+   * If EPB is removed by shifting bytes, it will return the original NALU
+   * length, which will fail this test
+   *
+   * Note that the CEA-608 packet in this test is incomplete
+   */
+  it('parses CEA-608 SEI data from MP4 H.264 stream', () => {
+    const seiProcessor = new shaka.cea.SeiProcessor();
+
+    const cea608Packet = new Uint8Array([
+      0x00, 0x00, 0x03, // Emulation prevention byte
+    ]);
+
+    const naluData = seiProcessor.removeEmu(cea608Packet);
+    expect(naluData).toBeDefined();
+
+    // EPB should be removed by returning new array, not by shifting bytes
+    expect(naluData.length).toBe(2);
+  });
+
   it('parses cea data from mp4 stream', () => {
     const cea708Parser = new shaka.cea.Mp4CeaParser();
 

package/test/dash/dash_parser_live_unit.js

@@ -276,6 +276,7 @@ describe('DashParser Live', () => {
         ref.timestampOffset = pStart;
         ref.startTime += pStart;
         ref.endTime += pStart;
+        ref.trueEndTime += pStart;
       }
       /** @const {!Array.<!shaka.media.SegmentReference>} */
       const allRefs = period1Refs.concat(period2Refs);