apple-audio-lang-sandbox

Author: JulianDomingo

build/all.py

@@ -95,14 +95,6 @@ def main(args):
   if gendeps.main([]) != 0:
     return 1
 
-  check_args = []
-  if parsed_args.fix:
-    check_args += ['--fix']
-  if parsed_args.force:
-    check_args += ['--force']
-  if check.main(check_args) != 0:
-    return 1
-
   docs_args = []
   if parsed_args.force:
     docs_args += ['--force']

externs/shaka/drm_info.js

@@ -48,7 +48,8 @@ shaka.extern.InitDataOverride;
  *   serverCertificateUri: string,
  *   sessionType: string,
  *   initData: Array<!shaka.extern.InitDataOverride>,
- *   keyIds: Set<string>
+ *   keyIds: Set<string>,
+ *   mediaTypes: (!Array<string>|undefined)
  * }}
  *
  * @description
@@ -103,6 +104,10 @@ shaka.extern.InitDataOverride;
  *   <i>Defaults to the empty Set</i> <br>
  *   If not empty, contains the default key IDs for this key system, as
  *   lowercase hex strings.
+ * @property {!Array<string>=} mediaTypes
+ *   An optional list specifying each component in a media type:
+ *   https://developer.mozilla.org/en-US/docs/Web/URI/Reference/Schemes/data#media-type
+ *   included in a <code>data:</code> scheme URI, separated by semicolon.
  * @exportDoc
  */
 shaka.extern.DrmInfo;

lib/drm/drm_engine.js

@@ -320,7 +320,7 @@ shaka.drm.DrmEngine = class {
 
     const makeDrmInfo = (encryptionScheme) => {
       const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-          keySystem, encryptionScheme, null);
+          keySystem, encryptionScheme, /* initData= */ null);
       drmInfo.licenseServerUri = licenseServerUri;
       drmInfo.serverCertificate = serverCertificate;
       drmInfo.persistentStateRequired = true;
@@ -800,6 +800,21 @@ shaka.drm.DrmEngine = class {
     return this.allSessionsLoaded_;
   }
 
+  /**
+   * Called when new initialization data is encountered.
+   *
+   * Certain fields may not be set yet in currentDrmInfo_ due to
+   * PreloadManager's early initialization of the DrmEngine
+   * (when currentDrmInfo_ is initialized).
+   * @param {!shaka.extern.DrmInfo} drmInfo
+   */
+  updateCurrentDrmInfo(drmInfo) {
+    if (this.currentDrmInfo_ &&
+        (this.currentDrmInfo_.mediaTypes !== drmInfo.mediaTypes)) {
+      this.currentDrmInfo_.mediaTypes = drmInfo.mediaTypes;
+    }
+  }
+
   /**
    * Called when new initialization data is encountered.  If this data hasn't
    * been seen yet, this will create a new session for it.
@@ -812,6 +827,22 @@ shaka.drm.DrmEngine = class {
       return;
     }
 
+    try {
+      initData = this.config_.initDataTransform(
+          initData, initDataType, this.currentDrmInfo_);
+    } catch (error) {
+      let shakaError = error;
+      if (!(error instanceof shaka.util.Error)) {
+        shakaError = new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.DRM,
+            shaka.util.Error.Code.INIT_DATA_TRANSFORM_ERROR,
+            error);
+      }
+      this.onError_(shakaError);
+      return;
+    }
+
     // Suppress duplicate init data.
     // Note that some init data are extremely large and can't portably be used
     // as keys in a dictionary.
@@ -1290,22 +1321,6 @@ shaka.drm.DrmEngine = class {
     };
     this.activeSessions_.set(session, metadata);
 
-    try {
-      initData = this.config_.initDataTransform(
-          initData, initDataType, this.currentDrmInfo_);
-    } catch (error) {
-      let shakaError = error;
-      if (!(error instanceof shaka.util.Error)) {
-        shakaError = new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.DRM,
-            shaka.util.Error.Code.INIT_DATA_TRANSFORM_ERROR,
-            error);
-      }
-      this.onError_(shakaError);
-      return;
-    }
-
     if (this.config_.logLicenseExchange) {
       const str = shaka.util.Uint8ArrayUtils.toBase64(initData);
       shaka.log.info('EME init data: type=', initDataType, 'data=', str);
@@ -1459,7 +1474,8 @@ shaka.drm.DrmEngine = class {
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.DRM,
           shaka.util.Error.Code.LICENSE_REQUEST_FAILED,
-          error, drmSessionMetadata);
+          error, drmSessionMetadata,
+          `activeSessionsSize=${this.activeSessions_.size}`);
       if (this.activeSessions_.size == 1) {
         this.onError_(shakaErr);
         if (metadata && metadata.updatePromise) {
@@ -2243,6 +2259,7 @@ shaka.drm.DrmEngine = class {
       serverCertificateUri: serverCertificateUris[0],
       initData: initDatas,
       keyIds,
+      mediaTypes: drmInfos[0].mediaTypes,
     };
 
     if (keySystemUris.size > 0) {
@@ -2472,7 +2489,7 @@ shaka.drm.DrmEngine = class {
   }
 
   /**
-   * Parse  pssh from a media segment and announce new initData
+   * Parse pssh from a media segment and announce new initData.
    *
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
    * @param {!BufferSource} mediaSegment

lib/drm/drm_utils.js

@@ -198,11 +198,15 @@ shaka.drm.DrmUtils = class {
    * @param {string} videoCodec
    * @param {string} audioCodec
    * @param {string} keySystem
+   * @param {!Array<string>} encryptionSchemes
    * @return {string}
    * @private
    */
-  static generateKeySystemCacheKey_(videoCodec, audioCodec, keySystem) {
-    return `${videoCodec}#${audioCodec}#${keySystem}`;
+  static generateKeySystemCacheKey_(videoCodec, audioCodec, keySystem,
+      encryptionSchemes) {
+    const uniqueSchemes = new Set(encryptionSchemes);
+    const schemeKey = [...uniqueSchemes].sort().join('#');
+    return `${videoCodec}#${audioCodec}#${keySystem}#${schemeKey}`;
   }
 
   /**
@@ -212,12 +216,14 @@ shaka.drm.DrmUtils = class {
    * @param {string} videoCodec
    * @param {string} audioCodec
    * @param {string} keySystem
+   * @param {!Array<string>} encryptionSchemes
    * @return {boolean}
    */
-  static hasMediaKeySystemAccess(videoCodec, audioCodec, keySystem) {
+  static hasMediaKeySystemAccess(videoCodec, audioCodec, keySystem,
+      encryptionSchemes) {
     const DrmUtils = shaka.drm.DrmUtils;
     const key = DrmUtils.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
+        videoCodec, audioCodec, keySystem, encryptionSchemes);
     return DrmUtils.memoizedMediaKeySystemAccessRequests_.has(key);
   }
 
@@ -227,12 +233,14 @@ shaka.drm.DrmUtils = class {
    * @param {string} videoCodec
    * @param {string} audioCodec
    * @param {string} keySystem
+   * @param {!Array<string>} encryptionSchemes
    * @return {?MediaKeySystemAccess}
    */
-  static getMediaKeySystemAccess(videoCodec, audioCodec, keySystem) {
+  static getMediaKeySystemAccess(videoCodec, audioCodec, keySystem,
+      encryptionSchemes) {
     const DrmUtils = shaka.drm.DrmUtils;
     const key = DrmUtils.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
+        videoCodec, audioCodec, keySystem, encryptionSchemes);
     return DrmUtils.memoizedMediaKeySystemAccessRequests_.get(key) || null;
   }
 
@@ -242,12 +250,14 @@ shaka.drm.DrmUtils = class {
    * @param {string} videoCodec
    * @param {string} audioCodec
    * @param {string} keySystem
+   * @param {!Array<string>} encryptionSchemes
    * @param {!MediaKeySystemAccess} mksa
    */
-  static setMediaKeySystemAccess(videoCodec, audioCodec, keySystem, mksa) {
+  static setMediaKeySystemAccess(videoCodec, audioCodec, keySystem,
+      encryptionSchemes, mksa) {
     const DrmUtils = shaka.drm.DrmUtils;
     const key = DrmUtils.generateKeySystemCacheKey_(
-        videoCodec, audioCodec, keySystem);
+        videoCodec, audioCodec, keySystem, encryptionSchemes);
     DrmUtils.memoizedMediaKeySystemAccessRequests_.set(key, mksa);
   }
 

lib/hls/hls_parser.js

@@ -4974,19 +4974,22 @@ shaka.hls.HlsParser = class {
       encryptionScheme = 'cbcs';
     }
 
-    const uri = drmTag.getRequiredAttrValue('URI');
+    const keySystemUri = drmTag.getRequiredAttrValue('URI');
 
     /*
      * Even if we're not able to construct initData through the HLS tag, adding
      * a DRMInfo will allow DRM Engine to request a media key system access
      * with the correct keySystem and initDataType
      */
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.apple.fps', encryptionScheme, [
+        'com.apple.fps',
+        encryptionScheme,
+        /* initData= */ [
           {initDataType: 'sinf', initData: new Uint8Array(0), keyId: null},
-        ], uri);
+        ],
+        keySystemUri);
 
-    let keyId = shaka.drm.FairPlay.defaultGetKeyId(uri);
+    let keyId = shaka.drm.FairPlay.defaultGetKeyId(keySystemUri);
     if (!keyId && initSegmentRef) {
       keyId = await this.getKeyIdFromInitSegment_(initSegmentRef);
     }
@@ -5028,9 +5031,13 @@ shaka.hls.HlsParser = class {
       this.psshToInitData_.set(psshKey, initData);
     }
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.widevine.alpha', encryptionScheme, [
+        'com.widevine.alpha',
+        encryptionScheme,
+        /* initData= */ [
           {initDataType: 'cenc', initData: this.psshToInitData_.get(psshKey)},
-        ]);
+        ],
+        /* keySystemUri= */ undefined,
+        /* mediaTypeList= */ parsedData.typeInfoList);
 
     const keyId = drmTag.getAttributeValue('KEYID');
     if (keyId) {
@@ -5082,9 +5089,13 @@ shaka.hls.HlsParser = class {
     const pssh =
         shaka.util.Pssh.createPssh(data, systemId, keyIds, psshVersion);
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.microsoft.playready', encryptionScheme, [
+        /* keySystem= */ 'com.microsoft.playready',
+        encryptionScheme,
+        /* initData= */ [
           {initDataType: 'cenc', initData: pssh},
-        ]);
+        ],
+        /* keySystemUri= */ undefined,
+        /* mediaTypeList= */ parsedData.typeInfoList);
 
     const input = shaka.util.TXml.parseXmlString([
       '<PLAYREADY>',
@@ -5129,9 +5140,13 @@ shaka.hls.HlsParser = class {
       this.psshToInitData_.set(psshKey, initData);
     }
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.huawei.wiseplay', encryptionScheme, [
+        /* keySystem= */ 'com.huawei.wiseplay',
+        encryptionScheme,
+        /* initData= */ [
           {initDataType: 'cenc', initData: this.psshToInitData_.get(psshKey)},
-        ]);
+        ],
+        /* keySystemUri= */ undefined,
+        /* mediaTypeList= */ parsedData.typeInfoList);
 
     const keyId = drmTag.getAttributeValue('KEYID');
     if (keyId) {

lib/media/adaptation_set.js

@@ -7,7 +7,7 @@
 goog.provide('shaka.media.AdaptationSet');
 
 goog.require('goog.asserts');
-goog.require('shaka.log');
+// goog.require('shaka.log');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.MimeUtils');
 
@@ -57,7 +57,8 @@ shaka.media.AdaptationSet = class {
 
     // To be nice, issue a warning if someone is trying to add something that
     // they shouldn't.
-    shaka.log.warning('Rejecting variant - not compatible with root.');
+    // shaka.log.warning('[APPLE, AdaptationSet]: Rejecting variant - not compatible with root: ' +
+        // `videoId=${variant.video.id};audioId=${variant.audio.id};${variant.audio.language};${variant.audio.label}`);
     return false;
   }
 

lib/media/content_workarounds.js

@@ -360,7 +360,7 @@ shaka.media.ContentWorkarounds = class {
     // changed, because they should all be within the first section we copy.
     for (const box of ancestorBoxes) {
       goog.asserts.assert(box.start < cutPoint,
-          'Ancestor MP4 box found in the wrong location!  ' +
+          `Ancestor MP4 box ${box.name} found in the wrong location!  ` +
           'Modified init segment will not make sense!');
       ContentWorkarounds.updateBoxSize_(
           newInitSegment, box.start, box.size + metadataBoxArray.byteLength);