shaka-player 3.1.5 → 3.2.3

package/lib/media/drm_engine.js

@@ -19,7 +19,6 @@ goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
 goog.require('shaka.util.Lazy');
-goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MapUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Platform');
@@ -213,10 +212,9 @@ shaka.media.DrmEngine = class {
    * @param {boolean} usePersistentLicenses
    *    Whether or not persistent licenses should be requested and stored for
    *    |manifest|.
-   * @param {boolean=} useMediaCapabilities
    * @return {!Promise}
    */
-  initForStorage(variants, usePersistentLicenses, useMediaCapabilities) {
+  initForStorage(variants, usePersistentLicenses) {
     this.initializedForStorage_ = true;
     // There are two cases for this call:
     //  1. We are about to store a manifest - in that case, there are no offline
@@ -230,7 +228,7 @@ shaka.media.DrmEngine = class {
     // persistent licenses.
     this.usePersistentLicenses_ = usePersistentLicenses;
 
-    return this.init_(variants, !!useMediaCapabilities);
+    return this.init_(variants);
   }
 
   /**
@@ -239,14 +237,13 @@ shaka.media.DrmEngine = class {
    * @param {!Array.<shaka.extern.Variant>} variants
    *    The variants that we want to support playing.
    * @param {!Array.<string>} offlineSessionIds
-   * @param {boolean=} useMediaCapabilities
    * @return {!Promise}
    */
-  initForPlayback(variants, offlineSessionIds, useMediaCapabilities) {
+  initForPlayback(variants, offlineSessionIds) {
     this.offlineSessionIds_ = offlineSessionIds;
     this.usePersistentLicenses_ = offlineSessionIds.length > 0;
 
-    return this.init_(variants, !!useMediaCapabilities);
+    return this.init_(variants);
   }
 
   /**
@@ -285,14 +282,14 @@ shaka.media.DrmEngine = class {
       audioRobustness: '',  // Not required by queryMediaKeys_
       videoRobustness: '',  // Same
       serverCertificate: serverCertificate,
+      serverCertificateUri: '',
       initData: null,
       keyIds: null,
     }];
 
     configsByKeySystem.set(keySystem, config);
     return this.queryMediaKeys_(configsByKeySystem,
-        /* variants= */ [],
-        /* useMediaCapabilities= */ false);
+        /* variants= */ []);
   }
 
   /**
@@ -303,11 +300,10 @@ shaka.media.DrmEngine = class {
    * @param {!Array.<shaka.extern.Variant>} variants
    *    The variants that we expect to operate with during the drm engine's
    *    lifespan of the drm engine.
-   * @param {boolean} useMediaCapabilities
    * @return {!Promise} Resolved if/when a key system has been chosen.
    * @private
    */
-  async init_(variants, useMediaCapabilities) {
+  async init_(variants) {
     goog.asserts.assert(this.config_,
         'DrmEngine configure() must be called before init()!');
 
@@ -365,13 +361,8 @@ shaka.media.DrmEngine = class {
 
     // We should get the decodingInfo results for the variants after we filling
     // in the drm infos, and before queryMediaKeys_().
-    if (useMediaCapabilities) {
-      await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
-          this.usePersistentLicenses_, this.srcEquals_);
-    } else {
-      configsByKeySystem =
-          this.prepareMediaKeyConfigsForVariants_(variants);
-    }
+    await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
+        this.usePersistentLicenses_, this.srcEquals_);
 
     const hasDrmInfo = hadDrmInfo || Object.keys(this.config_.servers).length;
     // An unencrypted content is initialized.
@@ -380,8 +371,7 @@ shaka.media.DrmEngine = class {
       return Promise.resolve();
     }
 
-    const p = this.queryMediaKeys_(configsByKeySystem, variants,
-        useMediaCapabilities);
+    const p = this.queryMediaKeys_(configsByKeySystem, variants);
 
     // TODO(vaage): Look into the assertion below. If we do not have any drm
     // info, we create drm info so that content can play if it has drm info
@@ -463,26 +453,63 @@ shaka.media.DrmEngine = class {
     goog.asserts.assert(this.initialized_,
         'Must call init() before setServerCertificate');
 
-    if (this.mediaKeys_ &&
-        this.currentDrmInfo_ &&
-        this.currentDrmInfo_.serverCertificate &&
-        this.currentDrmInfo_.serverCertificate.length) {
+    if (!this.mediaKeys_ || !this.currentDrmInfo_) {
+      return;
+    }
+
+    if (this.currentDrmInfo_.serverCertificateUri &&
+       (!this.currentDrmInfo_.serverCertificate ||
+       !this.currentDrmInfo_.serverCertificate.length)) {
+      const request = shaka.net.NetworkingEngine.makeRequest(
+          [this.currentDrmInfo_.serverCertificateUri],
+          this.config_.retryParameters);
+
       try {
-        const supported = await this.mediaKeys_.setServerCertificate(
-            this.currentDrmInfo_.serverCertificate);
-        if (!supported) {
-          shaka.log.warning('Server certificates are not supported by the ' +
-                            'key system.  The server certificate has been ' +
-                            'ignored.');
-        }
-      } catch (exception) {
+        const operation = this.playerInterface_.netEngine.request(
+            shaka.net.NetworkingEngine.RequestType.SERVER_CERTIFICATE,
+            request);
+        const response = await operation.promise;
+
+        this.currentDrmInfo_.serverCertificate =
+          shaka.util.BufferUtils.toUint8(response.data);
+      } catch (error) {
+        // Request failed!
+        goog.asserts.assert(error instanceof shaka.util.Error,
+            'Wrong NetworkingEngine error type!');
+
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.DRM,
-            shaka.util.Error.Code.INVALID_SERVER_CERTIFICATE,
-            exception.message);
+            shaka.util.Error.Code.SERVER_CERTIFICATE_REQUEST_FAILED,
+            error);
+      }
+
+      if (this.destroyer_.destroyed()) {
+        return;
       }
     }
+
+    if (!this.currentDrmInfo_.serverCertificate ||
+        !this.currentDrmInfo_.serverCertificate.length) {
+      return;
+    }
+
+    try {
+      const supported = await this.mediaKeys_.setServerCertificate(
+          this.currentDrmInfo_.serverCertificate);
+
+      if (!supported) {
+        shaka.log.warning('Server certificates are not supported by the ' +
+                          'key system.  The server certificate has been ' +
+                          'ignored.');
+      }
+    } catch (exception) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.DRM,
+          shaka.util.Error.Code.INVALID_SERVER_CERTIFICATE,
+          exception.message);
+    }
   }
 
   /**
@@ -578,7 +605,8 @@ shaka.media.DrmEngine = class {
       }
     }
 
-    this.createTemporarySession_(initDataType, initData);
+    this.createSession(initDataType, initData,
+        this.currentDrmInfo_.sessionType);
   }
 
   /** @return {boolean} */
@@ -604,6 +632,17 @@ shaka.media.DrmEngine = class {
     return false;
   }
 
+  /**
+   * @param {?string} keySystem
+   * @return {boolean} */
+  static isFairPlayKeySystem(keySystem) {
+    if (keySystem) {
+      return !!keySystem.match(/^com\.apple\.fps/);
+    }
+
+    return false;
+  }
+
   /**
    * Check if DrmEngine (as initialized) will likely be able to support the
    * given content type.
@@ -707,149 +746,15 @@ shaka.media.DrmEngine = class {
   }
 
   /**
-   * @param {!Array.<shaka.extern.Variant>} variants
-   * @see https://bit.ly/EmeConfig for MediaKeySystemConfiguration spec
-   * @return {!Map.<string, MediaKeySystemConfiguration>}
-   * @private
+   * Returns the current media key sessions.
+   *
+   * @return {!Array.<MediaKeySession>}
    */
-  prepareMediaKeyConfigsForVariants_(variants) {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
-    // Get all the drm info so that we can avoid using nested loops when we just
-    // need the drm info.
-    const allDrmInfo = new Set();
-    for (const variant of variants) {
-      const drmInfos = this.getVariantDrmInfos_(variant);
-      for (const info of drmInfos) {
-        allDrmInfo.add(info);
-      }
-    }
-
-    // Make sure all the drm infos are valid and filled in correctly.
-    for (const info of allDrmInfo) {
-      shaka.media.DrmEngine.fillInDrmInfoDefaults_(
-          info,
-          shaka.util.MapUtils.asMap(this.config_.servers),
-          shaka.util.MapUtils.asMap(this.config_.advanced || {}));
-    }
-
-    const persistentState =
-        this.usePersistentLicenses_ ? 'required' : 'optional';
-    const sessionTypes =
-        this.usePersistentLicenses_ ? ['persistent-license'] : ['temporary'];
-
-    const configs = new Map();
-
-    // Create a config entry for each key system.
-    for (const info of allDrmInfo) {
-      const config = {
-        initDataTypes: ['cenc'],
-        audioCapabilities: [],
-        videoCapabilities: [],
-        distinctiveIdentifier: 'optional',
-        persistentState: persistentState,
-        sessionTypes: sessionTypes,
-        label: info.keySystem,  // Tracked by us, ignored by EME.
-      };
-      // TODO: refactor, don't stick drmInfos onto MediaKeySystemConfiguration
-      config['drmInfos'] = [];  // Non-standard attribute, ignored by EME.
-
-      // Multiple calls to |set| will still respect the insertion order of the
-      // first call to |set| for a given key.
-      configs.set(info.keySystem, config);
-    }
-
-    // Connect each key system with each stream using it.
-    for (const variant of variants) {
-      /** @type {?shaka.extern.Stream} */
-      const audio = variant.audio;
-      /** @type {?shaka.extern.Stream} */
-      const video = variant.video;
-
-      // Add the last bit of information to each config;
-      for (const stream of [audio, video]) {
-        if (!stream) {
-          continue;
-        }
-
-        const mimeType = shaka.media.DrmEngine.computeMimeType_(stream);
-        let fallbackMimeType = null;
-
-        if (stream.codecs.toLowerCase() == 'ac-3' &&
-            shaka.util.Platform.isTizen()) {
-          // 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.
-          fallbackMimeType = shaka.media.DrmEngine.computeMimeType_(stream,
-              'ec-3');
-        }
-
-        for (const info of stream.drmInfos) {
-          const config = configs.get(info.keySystem);
-          goog.asserts.assert(
-              config,
-              'Any missing configs should have be filled in before.');
-
-          // TODO: refactor, don't stick drmInfos onto
-          // MediaKeySystemConfiguration
-          config['drmInfos'].push(info);
-
-          if (info.initData && info.initData.length) {
-            config.initDataTypes = [
-              ...new Set(
-                  info.initData.map((initData) => initData.initDataType)),
-            ];
-          }
-
-          if (info.distinctiveIdentifierRequired) {
-            config.distinctiveIdentifier = 'required';
-          }
-
-          if (info.persistentStateRequired) {
-            config.persistentState = 'required';
-          }
-
-          if (info.sessionType) {
-            config.sessionTypes = [info.sessionType];
-          }
-
-          const robustness = (stream.type == ContentType.AUDIO) ?
-              info.audioRobustness : info.videoRobustness;
-
-          /** @type {MediaKeySystemMediaCapability} */
-          const capability = {
-            robustness: robustness || '',
-            contentType: mimeType,
-          };
-
-          if (stream.type == ContentType.AUDIO) {
-            config.audioCapabilities.push(capability);
-          } else {
-            config.videoCapabilities.push(capability);
-          }
-
-          // This is how we work around some misbehaving platforms by adding
-          // synthetic capability records using a fallback MIME type.
-          if (fallbackMimeType) {
-            /** @type {MediaKeySystemMediaCapability} */
-            const fallbackCapability = {
-              robustness: robustness || '',
-              contentType: fallbackMimeType,
-            };
-
-            if (stream.type == ContentType.AUDIO) {
-              config.audioCapabilities.push(fallbackCapability);
-            } else {
-              config.videoCapabilities.push(fallbackCapability);
-            }
-          }
-        } // for (const info of stream.drmInfos)
-      } // for (const stream of [audio, video])
-    }  // for (const variant of variants)
-
-    return configs;
+  getMediaKeySessions() {
+    return Array.from(this.activeSessions_.keys());
   }
 
+
   /**
    * @param {shaka.extern.Stream} stream
    * @param {string=} codecOverride
@@ -872,14 +777,13 @@ shaka.media.DrmEngine = class {
    *   A dictionary of configs, indexed by key system, with an iteration order
    *   (insertion order) that reflects the preference for the application.
    * @param {!Array.<shaka.extern.Variant>} variants
-   * @param {boolean} useMediaCapabilities
    * @return {!Promise} Resolved if/when a key system has been chosen.
    * @private
    */
-  async queryMediaKeys_(configsByKeySystem, variants, useMediaCapabilities) {
+  async queryMediaKeys_(configsByKeySystem, variants) {
     const drmInfosByKeySystem = new Map();
 
-    const mediaKeySystemAccess = useMediaCapabilities ?
+    const mediaKeySystemAccess = variants.length ?
         this.getKeySystemAccessFromVariants_(variants, drmInfosByKeySystem) :
         await this.getKeySystemAccessByConfigs_(configsByKeySystem);
 
@@ -918,7 +822,7 @@ shaka.media.DrmEngine = class {
       goog.asserts.assert(this.supportedTypes_.size,
           'We should get at least one supported MIME type');
 
-      if (useMediaCapabilities) {
+      if (variants.length) {
         this.currentDrmInfo_ = this.createDrmInfoByInfos_(
             mediaKeySystemAccess.keySystem,
             drmInfosByKeySystem.get(mediaKeySystemAccess.keySystem));
@@ -990,6 +894,22 @@ shaka.media.DrmEngine = class {
           shaka.util.Error.Category.DRM,
           shaka.util.Error.Code.NO_RECOGNIZED_KEY_SYSTEMS);
     }
+
+    // If we have configured preferredKeySystems, choose a preferred keySystem
+    // if available.
+    for (const preferredKeySystem of this.config_.preferredKeySystems) {
+      for (const variant of variants) {
+        const decodingInfo = variant.decodingInfos.find((decodingInfo) => {
+          return decodingInfo.supported &&
+              decodingInfo.keySystemAccess != null &&
+              decodingInfo.keySystemAccess.keySystem == preferredKeySystem;
+        });
+        if (decodingInfo) {
+          return decodingInfo.keySystemAccess;
+        }
+      }
+    }
+
     // Try key systems with configured license servers first.  We only have to
     // try key systems without configured license servers for diagnostic
     // reasons, so that we can differentiate between "none of these key
@@ -1045,6 +965,24 @@ shaka.media.DrmEngine = class {
       }
     }
 
+    // If we have configured preferredKeySystems, choose the preferred one if
+    // available.
+    for (const keySystem of this.config_.preferredKeySystems) {
+      if (configsByKeySystem.has(keySystem)) {
+        const config = configsByKeySystem.get(keySystem);
+        try {
+          mediaKeySystemAccess =  // eslint-disable-next-line no-await-in-loop
+              await navigator.requestMediaKeySystemAccess(keySystem, [config]);
+          return mediaKeySystemAccess;
+        } catch (error) {
+          // Suppress errors.
+          shaka.log.v2(
+              'Requesting', keySystem, 'failed with config', config, error);
+        }
+        this.destroyer_.ensureNotDestroyed();
+      }
+    }
+
     // Try key systems with configured license servers first.  We only have to
     // try key systems without configured license servers for diagnostic
     // reasons, so that we can differentiate between "none of these key
@@ -1066,14 +1004,13 @@ shaka.media.DrmEngine = class {
 
         try {
           mediaKeySystemAccess =  // eslint-disable-next-line no-await-in-loop
-              await navigator.requestMediaKeySystemAccess(
-                  keySystem, [config]);
+              await navigator.requestMediaKeySystemAccess(keySystem, [config]);
           return mediaKeySystemAccess;
         } catch (error) {
+          // Suppress errors.
           shaka.log.v2(
-              'Requesting', keySystem, 'failed with config',
-              config, error);
-        } // Suppress errors.
+              'Requesting', keySystem, 'failed with config', config, error);
+        }
         this.destroyer_.ensureNotDestroyed();
       }
     }
@@ -1130,6 +1067,7 @@ shaka.media.DrmEngine = class {
       audioRobustness: '',
       videoRobustness: '',
       serverCertificate: null,
+      serverCertificateUri: '',
       sessionType: '',
       initData: initDatas,
       keyIds: new Set(keyIds),
@@ -1214,16 +1152,14 @@ shaka.media.DrmEngine = class {
   /**
    * @param {string} initDataType
    * @param {!Uint8Array} initData
-   * @private
+   * @param {string} sessionType
    */
-  createTemporarySession_(initDataType, initData) {
+  createSession(initDataType, initData, sessionType) {
     goog.asserts.assert(this.mediaKeys_,
         'mediaKeys_ should be valid when creating temporary session.');
 
     let session;
 
-    const sessionType = this.currentDrmInfo_.sessionType;
-
     try {
       shaka.log.info('Creating new', sessionType, 'session');
 
@@ -1912,6 +1848,8 @@ shaka.media.DrmEngine = class {
             videoRobustness: drm1.videoRobustness || drm2.videoRobustness,
             audioRobustness: drm1.audioRobustness || drm2.audioRobustness,
             serverCertificate: drm1.serverCertificate || drm2.serverCertificate,
+            serverCertificateUri: drm1.serverCertificateUri ||
+                drm2.serverCertificateUri,
             initData,
             keyIds,
           };
@@ -1986,6 +1924,7 @@ shaka.media.DrmEngine = class {
         audioRobustness: '',
         videoRobustness: '',
         serverCertificate: null,
+        serverCertificateUri: '',
         initData: [],
         keyIds: new Set(),
       });
@@ -2016,6 +1955,9 @@ shaka.media.DrmEngine = class {
     /** @type {!Array.<string>} */
     const licenseServers = [];
 
+    /** @type {!Array.<string>} */
+    const serverCertificateUris = [];
+
     /** @type {!Array.<!Uint8Array>} */
     const serverCerts = [];
 
@@ -2025,8 +1967,9 @@ shaka.media.DrmEngine = class {
     /** @type {!Set.<string>} */
     const keyIds = new Set();
 
-    shaka.media.DrmEngine.processDrmInfos_(drmInfos, licenseServers,
-        serverCerts, initDatas, keyIds);
+    shaka.media.DrmEngine.processDrmInfos_(
+        drmInfos, licenseServers, serverCerts,
+        serverCertificateUris, initDatas, keyIds);
 
     if (serverCerts.length > 1) {
       shaka.log.warning('Multiple unique server certificates found! ' +
@@ -2038,6 +1981,11 @@ shaka.media.DrmEngine = class {
                         'Only the first will be used.');
     }
 
+    if (serverCertificateUris.length > 1) {
+      shaka.log.warning('Multiple unique server certificate URIs found! ' +
+                        'Only the first will be used.');
+    }
+
     const defaultSessionType =
         this.usePersistentLicenses_ ? 'persistent-license' : 'temporary';
 
@@ -2051,6 +1999,7 @@ shaka.media.DrmEngine = class {
       audioRobustness: drmInfos[0].audioRobustness || '',
       videoRobustness: drmInfos[0].videoRobustness || '',
       serverCertificate: serverCerts[0],
+      serverCertificateUri: serverCertificateUris[0],
       initData: initDatas,
       keyIds,
     };
@@ -2082,6 +2031,9 @@ shaka.media.DrmEngine = class {
     /** @type {!Array.<string>} */
     const licenseServers = [];
 
+    /** @type {!Array.<string>} */
+    const serverCertificateUris = [];
+
     /** @type {!Array.<!Uint8Array>} */
     const serverCerts = [];
 
@@ -2093,13 +2045,19 @@ shaka.media.DrmEngine = class {
 
     // TODO: refactor, don't stick drmInfos onto MediaKeySystemConfiguration
     shaka.media.DrmEngine.processDrmInfos_(
-        config['drmInfos'], licenseServers, serverCerts, initDatas, keyIds);
+        config['drmInfos'], licenseServers, serverCerts,
+        serverCertificateUris, initDatas, keyIds);
 
     if (serverCerts.length > 1) {
       shaka.log.warning('Multiple unique server certificates found! ' +
                         'Only the first will be used.');
     }
 
+    if (serverCertificateUris.length > 1) {
+      shaka.log.warning('Multiple unique server certificate URIs found! ' +
+                        'Only the first will be used.');
+    }
+
     if (licenseServers.length > 1) {
       shaka.log.warning('Multiple unique license server URIs found! ' +
                         'Only the first will be used.');
@@ -2121,6 +2079,7 @@ shaka.media.DrmEngine = class {
       audioRobustness: audioRobustness || '',
       videoRobustness: videoRobustness || '',
       serverCertificate: serverCerts[0],
+      serverCertificateUri: serverCertificateUris[0],
       initData: initDatas,
       keyIds,
     };
@@ -2133,12 +2092,14 @@ shaka.media.DrmEngine = class {
    * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
    * @param {!Array.<string>} licenseServers
    * @param {!Array.<!Uint8Array>} serverCerts
+   * @param {!Array.<string>} serverCertificateUris
    * @param {!Array.<!shaka.extern.InitDataOverride>} initDatas
    * @param {!Set.<string>} keyIds
    * @private
    */
   static processDrmInfos_(
-      drmInfos, licenseServers, serverCerts, initDatas, keyIds) {
+      drmInfos, licenseServers, serverCerts,
+      serverCertificateUris, initDatas, keyIds) {
     /** @type {function(shaka.extern.InitDataOverride,
      *                  shaka.extern.InitDataOverride):boolean} */
     const initDataOverrideEqual = (a, b) => {
@@ -2157,6 +2118,11 @@ shaka.media.DrmEngine = class {
         licenseServers.push(drmInfo.licenseServerUri);
       }
 
+      // Build an array of unique license servers.
+      if (!serverCertificateUris.includes(drmInfo.serverCertificateUri)) {
+        serverCertificateUris.push(drmInfo.serverCertificateUri);
+      }
+
       // Build an array of unique server certs.
       if (drmInfo.serverCertificate) {
         const found = serverCerts.some(
@@ -2269,6 +2235,10 @@ shaka.media.DrmEngine = class {
       if (advancedConfig.sessionType) {
         drmInfo.sessionType = advancedConfig.sessionType;
       }
+
+      if (!drmInfo.serverCertificateUri) {
+        drmInfo.serverCertificateUri = advancedConfig.serverCertificateUri;
+      }
     }
 
     // Chromecast has a variant of PlayReady that uses a different key

package/lib/media/segment_index.js

@@ -345,7 +345,10 @@ shaka.media.SegmentIndex = class {
             lastReference.initSegmentReference,
             lastReference.timestampOffset,
             lastReference.appendWindowStart,
-            lastReference.appendWindowEnd);
+            lastReference.appendWindowEnd,
+            lastReference.partialReferences,
+            lastReference.tilesLayout,
+            lastReference.tileDuration);
   }
 
 

package/lib/media/segment_reference.js

@@ -135,12 +135,20 @@ shaka.media.SegmentReference = class {
    *   presentation.  Any content from after this time will be removed by
    *   MediaSource.
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
-       A list of SegmentReferences for the partial segments.
+   *   A list of SegmentReferences for the partial segments.
+   * @param {?string=} tilesLayout
+   *   The value is a grid-item-dimension consisting of two positive decimal
+   *   integers in the format: column-x-row ('4x3'). It describes the
+   *   arrangement of Images in a Grid. The minimum valid LAYOUT is '1x1'.
+   * @param {?number=} tileDuration
+   *  The explicit duration of an individual tile within the tiles grid.
+   *  If not provided, the duration should be automatically calculated based on
+   *  the duration of the reference.
    */
   constructor(
       startTime, endTime, uris, startByte, endByte, initSegmentReference,
       timestampOffset, appendWindowStart, appendWindowEnd,
-      partialReferences = []) {
+      partialReferences = [], tilesLayout = '', tileDuration = null) {
     // A preload hinted Partial Segment has the same startTime and endTime.
     goog.asserts.assert(startTime <= endTime,
         'startTime must be less than or equal to endTime');
@@ -184,6 +192,12 @@ shaka.media.SegmentReference = class {
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     this.partialReferences = partialReferences;
+
+    /** @type {?string} */
+    this.tilesLayout = tilesLayout;
+
+    /** @type {?number} */
+    this.tileDuration = tileDuration;
   }
 
   /**
@@ -258,6 +272,27 @@ shaka.media.SegmentReference = class {
   hasPartialSegments() {
     return this.partialReferences.length > 0;
   }
+
+  /**
+   * Returns the segment's tiles layout. Only defined in image segments.
+   *
+   * @return {?string}
+   * @export
+   */
+  getTilesLayout() {
+    return this.tilesLayout;
+  }
+
+  /**
+   * Returns the segment's explicit tile duration.
+   * Only defined in image segments.
+   *
+   * @return {?number}
+   * @export
+   */
+  getTileDuration() {
+    return this.tileDuration;
+  }
 };