shaka-player 3.2.2 → 3.3.2

package/lib/hls/hls_parser.js

@@ -25,6 +25,7 @@ goog.require('shaka.net.DataUriPlugin');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.BufferUtils');
+goog.require('shaka.util.CmcdManager');
 goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.FakeEvent');
@@ -332,7 +333,8 @@ shaka.hls.HlsParser = class {
     const segments = await this.createSegments_(
         streamInfo.verbatimMediaPlaylistUri, playlist, stream.type,
         stream.mimeType, streamInfo.mediaSequenceToStartTime, mediaVariables,
-        streamInfo.discontinuityToMediaSequence);
+        streamInfo.discontinuityToMediaSequence, stream.codecs,
+        stream.bandwidth);
 
     stream.segmentIndex.mergeAndEvict(
         segments, this.presentationTimeline_.getSegmentAvailabilityStart());
@@ -763,7 +765,7 @@ shaka.hls.HlsParser = class {
       const videoRange = tag.getAttributeValue('VIDEO-RANGE');
 
       const streamInfos = await this.createStreamInfosForVariantTag_(tag,
-          resolution, frameRate);
+          resolution, frameRate, bandwidth);
 
       if (streamInfos) {
         goog.asserts.assert(streamInfos.audio.length ||
@@ -797,10 +799,11 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {?string} resolution
    * @param {?string} frameRate
+   * @param {number} bandwidth
    * @return {!Promise.<?shaka.hls.HlsParser.StreamInfos>}
    * @private
    */
-  async createStreamInfosForVariantTag_(tag, resolution, frameRate) {
+  async createStreamInfosForVariantTag_(tag, resolution, frameRate, bandwidth) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     /** @type {!Array.<string>} */
     let allCodecs = this.getCodecsForVariantTag_(tag);
@@ -870,7 +873,8 @@ shaka.hls.HlsParser = class {
     let streamInfo;
     if (!ignoreStream) {
       streamInfo =
-          await this.createStreamInfoFromVariantTag_(tag, allCodecs, type);
+          await this.createStreamInfoFromVariantTag_(tag, allCodecs, type,
+              bandwidth);
     }
     if (streamInfo) {
       res[streamInfo.stream.type] = [streamInfo];
@@ -893,15 +897,12 @@ shaka.hls.HlsParser = class {
    */
   getCodecsForVariantTag_(tag) {
     // These are the default codecs to assume if none are specified.
-    // The video codec is H.264, with baseline profile and level 3.0.
-    // http://blog.pearce.org.nz/2013/11/what-does-h264avc1-codecs-parameters.html
-    // The audio codec is "low-complexity" AAC.
     const defaultCodecsArray = [];
     if (!this.config_.disableVideo) {
-      defaultCodecsArray.push('avc1.42E01E');
+      defaultCodecsArray.push(this.config_.hls.defaultVideoCodec);
     }
     if (!this.config_.disableAudio) {
-      defaultCodecsArray.push('mp4a.40.2');
+      defaultCodecsArray.push(this.config_.hls.defaultAudioCodec);
     }
     const defaultCodecs = defaultCodecsArray.join(',');
 
@@ -1280,6 +1281,30 @@ shaka.hls.HlsParser = class {
     if (this.uriToStreamInfosMap_.has(verbatimImagePlaylistUri)) {
       return this.uriToStreamInfosMap_.get(verbatimImagePlaylistUri);
     }
+
+    // Parse misc attributes.
+    const resolution = tag.getAttributeValue('RESOLUTION');
+    if (resolution) {
+      // The RESOLUTION tag represents the resolution of a single thumbnail, not
+      // of the entire sheet at once (like we expect in the output).
+      // So multiply by the layout size.
+
+      const reference = streamInfo.stream.segmentIndex.get(0);
+      const layout = reference.getTilesLayout();
+      if (layout) {
+        streamInfo.stream.width =
+            Number(resolution.split('x')[0]) * Number(layout.split('x')[0]);
+        streamInfo.stream.height =
+            Number(resolution.split('x')[1]) * Number(layout.split('x')[1]);
+        // TODO: What happens if there are multiple grids, with different
+        // layout sizes, inside this image stream?
+      }
+    }
+    const bandwidth = tag.getAttributeValue('BANDWIDTH');
+    if (bandwidth) {
+      streamInfo.stream.bandwidth = Number(bandwidth);
+    }
+
     this.uriToStreamInfosMap_.set(verbatimImagePlaylistUri, streamInfo);
     return streamInfo;
   }
@@ -1290,10 +1315,11 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Tag} tag
    * @param {!Array.<string>} allCodecs
    * @param {string} type
+   * @param {number} bandwidth
    * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
-  async createStreamInfoFromVariantTag_(tag, allCodecs, type) {
+  async createStreamInfoFromVariantTag_(tag, allCodecs, type, bandwidth) {
     goog.asserts.assert(tag.name == 'EXT-X-STREAM-INF',
         'Should only be called on variant tags!');
     const verbatimMediaPlaylistUri = this.variableSubstitution_(
@@ -1309,7 +1335,7 @@ shaka.hls.HlsParser = class {
         codecs, type, /* language= */ 'und', /* primary= */ false,
         /* name= */ null, /* channelcount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
-        /* spatialAudio= */ false);
+        /* spatialAudio= */ false, bandwidth);
     if (streamInfo == null) {
       return null;
     }
@@ -1336,12 +1362,13 @@ shaka.hls.HlsParser = class {
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {boolean} spatialAudio
+   * @param {(number|undefined)} bandwidth
    * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfo_(verbatimMediaPlaylistUri, codecs, type, language,
       primary, name, channelsCount, closedCaptions, characteristics, forced,
-      spatialAudio) {
+      spatialAudio, bandwidth = undefined) {
     // TODO: Refactor, too many parameters
     let absoluteMediaPlaylistUri = shaka.hls.Utils.constructAbsoluteUri(
         this.masterPlaylistUri_, verbatimMediaPlaylistUri);
@@ -1459,7 +1486,7 @@ shaka.hls.HlsParser = class {
     try {
       segments = await this.createSegments_(verbatimMediaPlaylistUri,
           playlist, type, mimeType, mediaSequenceToStartTime, mediaVariables,
-          discontinuityToMediaSequence);
+          discontinuityToMediaSequence, codecs, bandwidth);
     } catch (error) {
       if (error.code == shaka.util.Error.Code.HLS_INTERNAL_SKIP_STREAM) {
         shaka.log.alwaysWarn('Skipping unsupported HLS stream',
@@ -1811,6 +1838,7 @@ shaka.hls.HlsParser = class {
     }
 
     let tilesLayout = '';
+    let tileDuration = null;
     if (type == shaka.util.ManifestParserUtils.ContentType.IMAGE) {
       // By default in HLS the tilesLayout is 1x1
       tilesLayout = '1x1';
@@ -1818,6 +1846,10 @@ shaka.hls.HlsParser = class {
           shaka.hls.Utils.getFirstTagWithName(tags, 'EXT-X-TILES');
       if (tilesTag) {
         tilesLayout = tilesTag.getRequiredAttrValue('LAYOUT');
+        const duration = tilesTag.getAttributeValue('DURATION');
+        if (duration) {
+          tileDuration = Number(duration);
+        }
       }
     }
 
@@ -1833,6 +1865,7 @@ shaka.hls.HlsParser = class {
         /* appendWindowEnd= */ Infinity,
         partialSegmentRefs,
         tilesLayout,
+        tileDuration,
     );
   }
 
@@ -1887,11 +1920,14 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<number, number>} mediaSequenceToStartTime
    * @param {!Map.<string, string>} variables
    * @param {!Map.<number, number>} discontinuityToMediaSequence
+   * @param {string} codecs
+   * @param {(number|undefined)} bandwidth
    * @return {!Promise<!Array.<!shaka.media.SegmentReference>>}
    * @private
    */
   async createSegments_(verbatimMediaPlaylistUri, playlist, type, mimeType,
-      mediaSequenceToStartTime, variables, discontinuityToMediaSequence) {
+      mediaSequenceToStartTime, variables, discontinuityToMediaSequence,
+      codecs, bandwidth) {
     /** @type {Array.<!shaka.hls.Segment>} */
     const hlsSegments = playlist.segments;
     goog.asserts.assert(hlsSegments.length, 'Playlist should have segments!');
@@ -1934,7 +1970,7 @@ shaka.hls.HlsParser = class {
         this.playlistStartTime_ = await this.getStartTime_(
             verbatimMediaPlaylistUri, initSegmentRef, mimeType,
             position, /* isDiscontinuity= */ false,
-            hlsSegments[0], variables, type);
+            hlsSegments[0], variables, type, codecs, bandwidth);
       }
       firstStartTime = this.playlistStartTime_;
     }
@@ -1987,7 +2023,8 @@ shaka.hls.HlsParser = class {
         // eslint-disable-next-line no-await-in-loop
         timestampOffset = await this.getTimestampOffset_(
             discontintuitySequenceNum, verbatimMediaPlaylistUri, initSegmentRef,
-            mimeType, position, item, variables, startTime, type);
+            mimeType, position, item, variables, startTime, type, codecs,
+            bandwidth);
       }
 
       // If the stream is low latency and the user has not configured the
@@ -2041,13 +2078,16 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<string, string>} variables
    * @param {number} startTime
    * @param {string} type
+   * @param {string} codecs
+   * @param {number|undefined} bandwidth
    * @return {!Promise.<number>}
    * @throws {shaka.util.Error}
    * @private
    */
   async getTimestampOffset_(discontintuitySequenceNum,
       verbatimMediaPlaylistUri, initSegmentRef,
-      mimeType, mediaSequenceNumber, segment, variables, startTime, type) {
+      mimeType, mediaSequenceNumber, segment, variables, startTime, type,
+      codecs, bandwidth) {
     let timestampOffset = 0;
     if (this.discontinuityToTso_.has(discontintuitySequenceNum)) {
       timestampOffset =
@@ -2056,7 +2096,7 @@ shaka.hls.HlsParser = class {
       const mediaStartTime = await this.getStartTime_(
           verbatimMediaPlaylistUri, initSegmentRef, mimeType,
           mediaSequenceNumber, /* isDiscontinuity= */ true, segment,
-          variables, type);
+          variables, type, codecs, bandwidth);
       timestampOffset = startTime - mediaStartTime;
       shaka.log.v1('Segment timestampOffset =', timestampOffset);
       this.discontinuityToTso_.set(
@@ -2070,10 +2110,14 @@ shaka.hls.HlsParser = class {
    * segment if we have to.
    *
    * @param {!shaka.media.AnySegmentReference} reference
+   * @param {string} type
+   * @param {string} mimeType
+   * @param {string} codecs
+   * @param {number|undefined} bandwidth
    * @return {!Promise.<shaka.extern.Response>}
    * @private
    */
-  async fetchStartOfSegment_(reference) {
+  async fetchStartOfSegment_(reference, type, mimeType, codecs, bandwidth) {
     const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
 
     // Create two requests:
@@ -2087,6 +2131,20 @@ shaka.hls.HlsParser = class {
         reference.endByte,
         this.config_.retryParameters);
 
+    // We can only add partial CMCD data here because the stream
+    // and manifest objects are still being created
+    this.playerInterface_.modifySegmentRequest(
+        fullRequest,
+        {
+          type: type,
+          init: reference instanceof shaka.media.InitSegmentReference,
+          duration: reference.endTime - reference.startTime,
+          mimeType: mimeType,
+          codecs: codecs,
+          bandwidth: bandwidth,
+        },
+    );
+
     if (this.config_.hls.useFullSegmentsForStartTime) {
       return this.makeNetworkRequest_(fullRequest, requestType);
     }
@@ -2097,6 +2155,18 @@ shaka.hls.HlsParser = class {
         reference.startByte + shaka.hls.HlsParser.START_OF_SEGMENT_SIZE_ - 1,
         this.config_.retryParameters);
 
+    this.playerInterface_.modifySegmentRequest(
+        partialRequest,
+        {
+          type: type,
+          init: reference instanceof shaka.media.InitSegmentReference,
+          duration: reference.endTime - reference.startTime,
+          mimeType: mimeType,
+          codecs: codecs,
+          bandwidth: bandwidth,
+        },
+    );
+
     // TODO(vaage): The need to do fall back requests is not likely to be unique
     //    to here. It would be nice if the fallback(s) could be included into
     //    the same abortable operation as the original request.
@@ -2144,12 +2214,14 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Segment} segment
    * @param {!Map.<string, string>} variables
    * @param {string} type
+   * @param {string} codecs
+   * @param {number|undefined} bandwidth
    * @return {!Promise.<number>}
    * @private
    */
   async getStartTime_(
       verbatimMediaPlaylistUri, initSegmentRef, mimeType, mediaSequenceNumber,
-      isDiscontinuity, segment, variables, type) {
+      isDiscontinuity, segment, variables, type, codecs, bandwidth) {
     const segmentRef = this.createSegmentReference_(
         initSegmentRef,
         /* previousReference= */ null,
@@ -2217,10 +2289,22 @@ shaka.hls.HlsParser = class {
     if (mimeType == 'video/mp4' || mimeType == 'audio/mp4') {
       // We also need the init segment to get the correct timescale. But if the
       // stream is self-initializing, use the same response for both.
-      const fetches = [this.fetchStartOfSegment_(segmentRef)];
+      const fetches = [this.fetchStartOfSegment_(
+          segmentRef,
+          type,
+          mimeType,
+          codecs,
+          bandwidth,
+      )];
 
       if (initSegmentRef) {
-        fetches.push(this.fetchStartOfSegment_(initSegmentRef));
+        fetches.push(this.fetchStartOfSegment_(
+            initSegmentRef,
+            type,
+            mimeType,
+            codecs,
+            bandwidth,
+        ));
       }
 
       const responses = await Promise.all(fetches);
@@ -2236,7 +2320,13 @@ shaka.hls.HlsParser = class {
     }
 
     if (mimeType == 'video/mp2t') {
-      const response = await this.fetchStartOfSegment_(segmentRef);
+      const response = await this.fetchStartOfSegment_(
+          segmentRef,
+          type,
+          mimeType,
+          codecs,
+          bandwidth,
+      );
       goog.asserts.assert(response.data, 'Should have a response body!');
       return this.getStartTimeFromTsSegment_(
           verbatimMediaPlaylistUri, response.uri, response.data);
@@ -2614,6 +2704,9 @@ shaka.hls.HlsParser = class {
     const request = shaka.net.NetworkingEngine.makeRequest(
         [absoluteUri], this.config_.retryParameters);
 
+    const format = shaka.util.CmcdManager.StreamingFormat.HLS;
+    this.playerInterface_.modifyManifestRequest(request, {format: format});
+
     return this.makeNetworkRequest_(request, requestType);
   }
 

package/lib/hls/manifest_text_parser.js

@@ -277,6 +277,7 @@ shaka.hls.ManifestTextParser = class {
         const attrValue = blockAttrs[2] || blockAttrs[3];
         const attribute = new shaka.hls.Attribute(attrName, attrValue);
         attributes.push(attribute);
+        parser.skipWhitespace();
       }
     }
 

package/lib/media/quality_observer.js

@@ -0,0 +1,274 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.media.QualityObserver');
+
+goog.require('shaka.media.IPlayheadObserver');
+goog.require('shaka.log');
+goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.FakeEventTarget');
+
+/**
+ * Monitors the quality of content being appended to the source buffers and
+ * fires 'qualitychange' events when the media quality at the playhead changes.
+ *
+ * @implements {shaka.media.IPlayheadObserver}
+ * @final
+ */
+shaka.media.QualityObserver = class extends shaka.util.FakeEventTarget {
+  /**
+   * Creates a new QualityObserver.
+   *
+   * @param {!function():!shaka.extern.BufferedInfo} getBufferedInfo
+   *   Buffered info is needed to purge QualityChanges that are no
+   *   longer relevant.
+   */
+  constructor(getBufferedInfo) {
+    super();
+
+    /**
+     * @private {!Map.<string,!shaka.media.QualityObserver.ContentTypeState>}
+     */
+    this.contentTypeStates_ = new Map();
+
+    /** @private function():!shaka.extern.BufferedInfo */
+    this.getBufferedInfo_ = getBufferedInfo;
+  }
+
+  /** @override */
+  release() {
+    this.contentTypeStates_.clear();
+    super.release();
+  }
+
+  /**
+   * Get the ContenTypeState for a contentType, creating a new
+   * one if necessary.
+   *
+   * @param {!string} contentType
+   *  The contend type e.g. "video" or "audio".
+   * @return {!shaka.media.QualityObserver.ContentTypeState}
+   * @private
+   */
+  getContentTypeState_(contentType) {
+    let contentTypeState = this.contentTypeStates_.get(contentType);
+    if (!contentTypeState) {
+      contentTypeState = {
+        qualityChangePositions: [],
+        currentQuality: null,
+        contentType: contentType,
+      };
+      this.contentTypeStates_.set(contentType, contentTypeState);
+    }
+    return contentTypeState;
+  }
+
+  /**
+   * Adds a QualityChangePosition for the contentType identified by
+   * the mediaQuality.contentType.
+   *
+   * @param {!shaka.extern.MediaQualityInfo} mediaQuality
+   * @param {!number} position
+   *  Position in seconds of the quality change.
+   */
+  addMediaQualityChange(mediaQuality, position) {
+    const contentTypeState =
+      this.getContentTypeState_(mediaQuality.contentType);
+
+    // Remove unneeded QualityChangePosition(s) before adding the new one
+    this.purgeQualityChangePositions_(contentTypeState);
+
+    const newChangePosition = {
+      mediaQuality: mediaQuality,
+      position: position,
+    };
+
+    const changePositions = contentTypeState.qualityChangePositions;
+    const insertBeforeIndex = changePositions.findIndex(
+        (qualityChange) => (qualityChange.position >= position));
+
+    if (insertBeforeIndex >= 0) {
+      const duplicatePositions =
+        (changePositions[insertBeforeIndex].position == position) ? 1 : 0;
+      changePositions.splice(
+          insertBeforeIndex, duplicatePositions, newChangePosition);
+    } else {
+      changePositions.push(newChangePosition);
+    }
+  }
+
+  /**
+   * Determines the media quality at a specific position in the source buffer.
+   *
+   * @param {!number} position
+   *  Position in seconds
+   * @param {!shaka.media.QualityObserver.ContentTypeState} contentTypeState
+   * @return {?shaka.extern.MediaQualityInfo}
+   * @private
+   */
+  static getMediaQualityAtPosition_(position, contentTypeState) {
+    // The qualityChangePositions must be ordered by position ascending
+    // Find the last QualityChangePosition prior to the position
+    const changePositions = contentTypeState.qualityChangePositions;
+    for (let i = changePositions.length - 1; i >= 0; i--) {
+      const qualityChange = changePositions[i];
+      if (qualityChange.position <= position) {
+        return qualityChange.mediaQuality;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Determines if two MediaQualityInfo objects are the same or not.
+   *
+   * @param {?shaka.extern.MediaQualityInfo} mq1
+   * @param {?shaka.extern.MediaQualityInfo} mq2
+   * @return {boolean}
+   * @private
+   */
+  static mediaQualitiesAreTheSame_(mq1, mq2) {
+    if (mq1 === mq2) {
+      return true;
+    }
+    if (!mq1 || !mq2) {
+      return false;
+    }
+    return (mq1.bandwidth == mq2.bandwidth) &&
+      (mq1.audioSamplingRate == mq2.audioSamplingRate) &&
+      (mq1.codecs == mq2.codecs) &&
+      (mq1.contentType == mq2.contentType) &&
+      (mq1.frameRate == mq2.frameRate) &&
+      (mq1.height == mq2.height) &&
+      (mq1.mimeType == mq2.mimeType) &&
+      (mq1.channelsCount == mq2.channelsCount) &&
+      (mq1.pixelAspectRatio == mq2.pixelAspectRatio) &&
+      (mq1.width == mq2.width);
+  }
+
+  /** @override */
+  poll(positionInSeconds, wasSeeking) {
+    for (const contentTypeState of this.contentTypeStates_.values()) {
+      const qualityAtPosition =
+        shaka.media.QualityObserver.getMediaQualityAtPosition_(
+            positionInSeconds, contentTypeState);
+      if (qualityAtPosition &&
+          !shaka.media.QualityObserver.mediaQualitiesAreTheSame_(
+              contentTypeState.currentQuality, qualityAtPosition)) {
+        if (this.positionIsBuffered_(
+            positionInSeconds, qualityAtPosition.contentType)) {
+          contentTypeState.currentQuality = qualityAtPosition;
+
+          shaka.log.debug('Media quality changed at position ' +
+            positionInSeconds + ' ' + JSON.stringify(qualityAtPosition));
+
+          const event = new shaka.util.FakeEvent('qualitychange', new Map([
+            ['quality', qualityAtPosition],
+            ['position', positionInSeconds],
+          ]));
+          this.dispatchEvent(event);
+        }
+      }
+    }
+  }
+
+  /**
+   * Determine if a position is buffered for a given content type.
+   *
+   * @param {!number} position
+   * @param {!string} contentType
+   * @private
+   */
+  positionIsBuffered_(position, contentType) {
+    const bufferedInfo = this.getBufferedInfo_();
+    const bufferedRanges = bufferedInfo[contentType];
+    if (bufferedRanges && bufferedRanges.length > 0) {
+      const bufferStart = bufferedRanges[0].start;
+      const bufferEnd = bufferedRanges[bufferedRanges.length - 1].end;
+      if (position >= bufferStart && position < bufferEnd) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Removes the QualityChangePosition(s) that are not relevant to the buffered
+   * content of the specified contentType. Note that this function is
+   * invoked just before adding the quality change info associated with
+   * the next media segment to be appended.
+   *
+   * @param {!shaka.media.QualityObserver.ContentTypeState} contentTypeState
+   * @private
+   */
+  purgeQualityChangePositions_(contentTypeState) {
+    const bufferedInfo = this.getBufferedInfo_();
+    const bufferedRanges = bufferedInfo[contentTypeState.contentType];
+
+    if (bufferedRanges && bufferedRanges.length > 0) {
+      const bufferStart = bufferedRanges[0].start;
+      const bufferEnd = bufferedRanges[bufferedRanges.length - 1].end;
+      const oldChangePositions = contentTypeState.qualityChangePositions;
+      contentTypeState.qualityChangePositions =
+        oldChangePositions.filter(
+            (qualityChange, index) => {
+              // Remove all but last quality change before bufferStart.
+              if ((qualityChange.position <= bufferStart) &&
+                (index + 1 < oldChangePositions.length) &&
+                (oldChangePositions[index + 1].position <= bufferStart)) {
+                return false;
+              }
+              // Remove all quality changes after bufferEnd.
+              if (qualityChange.position >= bufferEnd) {
+                return false;
+              }
+              return true;
+            });
+    } else {
+      // Nothing is buffered; so remove all quality changes.
+      contentTypeState.qualityChangePositions = [];
+    }
+  }
+};
+
+/**
+  * @typedef {{
+  *   mediaQuality: !shaka.extern.MediaQualityInfo,
+  *   position: !number
+  * }}
+  *
+  * @description
+  * Identifies the position of a media quality change in the
+  * source buffer.
+  *
+  * @property {shaka.extern.MediaQualityInfo} !mediaQuality
+  *   The new media quality for content after position in the source buffer.
+  * @property {number} !position
+  *   A position in seconds in the source buffer
+  */
+shaka.media.QualityObserver.QualityChangePosition;
+
+/**
+  * @typedef {{
+  *  qualityChangePositions:
+  *   !Array.<shaka.media.QualityObserver.QualityChangePosition>,
+  *  currentQuality: ?shaka.extern.MediaQualityInfo,
+  *  contentType: !string
+  * }}
+  *
+  * @description
+  * Contains media quality information for a specific content type
+  * e.g video or audio.
+  *
+  * @property {!Array.<shaka.media.QualityObserver.QualityChangePosition>}
+  * qualityChangePositions
+  *   Quality changes ordered by position ascending.
+  * @property {?shaka.media.MediaQualityInfo} currentMediaQuality
+  *   The media quality at the playhead position.
+  * @property {string} contentType
+  *   The contentType e.g. 'video' or 'audio'
+  */
+shaka.media.QualityObserver.ContentTypeState;