shaka-player 4.7.12 → 4.8.0

package/lib/polyfill/media_capabilities.js

@@ -208,14 +208,29 @@ shaka.polyfill.MediaCapabilities = class {
           };
         }
 
+        if (mediaCapkeySystemConfig.audio.encryptionScheme) {
+          capability = {
+            robustness: capability.robustness,
+            contentType: capability.contentType,
+            encryptionScheme: mediaCapkeySystemConfig.audio.encryptionScheme,
+          };
+        }
+
         audioCapabilities.push(capability);
       }
 
       if (mediaCapkeySystemConfig.video) {
-        const capability = {
+        let capability = {
           robustness: mediaCapkeySystemConfig.video.robustness || '',
           contentType: mediaDecodingConfig.video.contentType,
         };
+        if (mediaCapkeySystemConfig.video.encryptionScheme) {
+          capability = {
+            robustness: capability.robustness,
+            contentType: capability.contentType,
+            encryptionScheme: mediaCapkeySystemConfig.video.encryptionScheme,
+          };
+        }
         videoCapabilities.push(capability);
       }
 

package/lib/text/simple_text_displayer.js

@@ -56,6 +56,15 @@ shaka.text.SimpleTextDisplayer = class {
     this.textTrack_.mode = 'hidden';
   }
 
+
+  /**
+   * @override
+   * @export
+   */
+  configure(config) {
+    // Unused.
+  }
+
   /**
    * @override
    * @export

package/lib/text/stub_text_displayer.js

@@ -13,6 +13,13 @@ goog.provide('shaka.text.StubTextDisplayer');
 * @export
 */
 shaka.text.StubTextDisplayer = class {
+  /**
+   * @override
+   * @export
+   */
+  configure(config) {
+  }
+
   /**
    * @override
    * @export

package/lib/text/text_engine.js

@@ -7,7 +7,7 @@
 goog.provide('shaka.text.TextEngine');
 
 goog.require('goog.asserts');
-goog.require('shaka.log');
+goog.require('shaka.Deprecate');
 goog.require('shaka.media.ClosedCaptionParser');
 goog.require('shaka.text.Cue');
 goog.require('shaka.util.BufferUtils');
@@ -51,6 +51,9 @@ shaka.text.TextEngine = class {
     /** @private {string} */
     this.selectedClosedCaptionId_ = '';
 
+    /** @private {shaka.extern.TextParser.ModifyCueCallback} */
+    this.modifyCueCallback_ = (cue, uri) => {};
+
     /**
      * The closed captions map stores the CEA closed captions by closed captions
      * id and start and end time.
@@ -150,18 +153,25 @@ shaka.text.TextEngine = class {
     if (this.parser_.setSequenceMode) {
       this.parser_.setSequenceMode(sequenceMode);
     } else {
-      shaka.log.alwaysWarn(
+      shaka.Deprecate.deprecateFeature(5,
+          'Text parsers w/ setSequenceMode',
           'Text parsers should have a "setSequenceMode" method!');
     }
     if (this.parser_.setManifestType) {
       this.parser_.setManifestType(manifestType);
     } else {
-      shaka.log.alwaysWarn(
+      shaka.Deprecate.deprecateFeature(5,
+          'Text parsers w/ setManifestType',
           'Text parsers should have a "setManifestType" method!');
     }
     this.segmentRelativeVttTiming_ = segmentRelativeVttTiming;
   }
 
+  /** @param {shaka.extern.TextParser.ModifyCueCallback} modifyCueCallback */
+  setModifyCueCallback(modifyCueCallback) {
+    this.modifyCueCallback_ = modifyCueCallback;
+  }
+
   /**
    * @param {BufferSource} buffer
    * @param {?number} startTime relative to the start of the presentation
@@ -200,6 +210,9 @@ shaka.text.TextEngine = class {
     // Parse the buffer and add the new cues.
     const allCues = this.parser_.parseMedia(
         shaka.util.BufferUtils.toUint8(buffer), time, uri);
+    for (const cue of allCues) {
+      this.modifyCueCallback_(cue, uri || null, time);
+    }
     const cuesToAppend = allCues.filter((cue) => {
       return cue.startTime >= this.appendWindowStart_ &&
           cue.startTime < this.appendWindowEnd_;