diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
index 1792d1d92a..37e1eb970a 100644
--- a/lib/hls/hls_parser.js
+++ b/lib/hls/hls_parser.js
@@ -71,10 +71,10 @@ shaka.hls.HlsParser = class {
     this.globalId_ = 1;
 
     /**
-     * @private {!Map.<number, shaka.hls.HlsParser.StreamInfo>}
+     * A map from group id to stream infos created from the media tags.
+     * @private {!Map.<string, !Array.<shaka.hls.HlsParser.StreamInfo>>}
      */
-    // TODO: This is now only used for text codec detection, try to remove.
-    this.mediaTagsToStreamInfosMap_ = new Map();
+    this.groupIdToStreamInfosMap_ = new Map();
 
     /**
      * The values are strings of the form "<VIDEO URI> - <AUDIO URI>",
@@ -167,6 +167,9 @@ shaka.hls.HlsParser = class {
     /** True if some of the variants in  the playlist is encrypted with AES-128.
      * @private {boolean} */
     this.aesEncrypted_ = false;
+
+    /** @type {Map.<string, string>} */
+    this.groupIdToCodecsMap_ = new Map();
   }
 
   /**
@@ -225,10 +228,11 @@ shaka.hls.HlsParser = class {
 
     this.playerInterface_ = null;
     this.config_ = null;
-    this.mediaTagsToStreamInfosMap_.clear();
     this.variantUriSet_.clear();
-    this.uriToStreamInfosMap_.clear();
     this.manifest_ = null;
+    this.uriToStreamInfosMap_.clear();
+    this.groupIdToStreamInfosMap_.clear();
+    this.groupIdToCodecsMap_.clear();
 
     return Promise.all(pending);
   }
@@ -342,7 +346,7 @@ shaka.hls.HlsParser = class {
           shaka.util.Error.Code.HLS_MASTER_PLAYLIST_NOT_PROVIDED);
     }
 
-    const period = await this.createPeriod_(playlist);
+    const period = await this.createPeriod_(playlist.tags);
 
     // Make sure that the parser has not been destroyed.
     if (!this.playerInterface_) {
@@ -473,30 +477,23 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * Parses a playlist into a Period object.
+   * Parses the playlist tags and creates a Period object.
    *
-   * @param {!shaka.hls.Playlist} playlist
+   * @param {!Array.<!shaka.hls.Tag>} tags All tags from the playlist.
    * @return {!Promise.<!shaka.extern.Period>}
    * @private
    */
-  async createPeriod_(playlist) {
-    const tags = playlist.tags;
-
-    const textStreams = await this.parseTexts_(tags);
-
-    // Create Variants for every 'EXT-X-STREAM-INF' tag.  Do this after text
-    // streams have been created, so that we can push text codecs found on the
-    // variant tag back into the created text streams.
-    const variantTags =
-        shaka.hls.Utils.filterTagsByName(tags, 'EXT-X-STREAM-INF');
-    const variantsPromises = variantTags.map((tag) => {
-      return this.createVariantsForTag_(tag, playlist);
-    });
+  async createPeriod_(tags) {
+    const Utils = shaka.hls.Utils;
+    /** @type {!Array.<!shaka.hls.Tag>} */
+    const mediaTags = Utils.filterTagsByName(tags, 'EXT-X-MEDIA');
+    /** @type {!Array.<!shaka.hls.Tag>} */
+    const variantTags = Utils.filterTagsByName(tags, 'EXT-X-STREAM-INF');
 
-    const allVariants = await Promise.all(variantsPromises);
-    let variants = allVariants.reduce(shaka.util.Functional.collapseArrays, []);
-    // Filter out null variants.
-    variants = variants.filter((variant) => variant != null);
+    this.parseCodecs_(variantTags);
+    const textStreams = await this.parseTexts_(mediaTags);
+    await this.createStreamInfosFromMediaTags_(mediaTags);
+    const variants = await this.createVariantsForTags_(variantTags);
 
     return {
       startTime: 0,
@@ -505,74 +502,133 @@ shaka.hls.HlsParser = class {
     };
   }
 
+  /**
+   * Get the codecs of each variant tag, and store in a map from
+   * audio/video/subtitle group id to the codecs arraylist.
+   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * @private
+   */
+  parseCodecs_(tags) {
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
+    for (const variantTag of tags) {
+      const audioGroupId = variantTag.getAttributeValue('AUDIO');
+      const videoGroupId = variantTag.getAttributeValue('VIDEO');
+      const subGroupId = variantTag.getAttributeValue('SUBTITLES');
+      const allCodecs = this.getCodecsForVariantTag_(variantTag);
+
+      if (subGroupId) {
+        const textCodecs = this.guessCodecsSafe_(ContentType.TEXT, allCodecs);
+        goog.asserts.assert(textCodecs != null, 'Text codecs should be valid.');
+        this.groupIdToCodecsMap_.set(subGroupId, textCodecs);
+        shaka.util.ArrayUtils.remove(allCodecs, textCodecs);
+      }
+      if (audioGroupId) {
+        const codecs = this.guessCodecs_(ContentType.AUDIO, allCodecs);
+        this.groupIdToCodecsMap_.set(audioGroupId, codecs);
+      }
+      if (videoGroupId) {
+        const codecs = this.guessCodecs_(ContentType.VIDEO, allCodecs);
+        this.groupIdToCodecsMap_.set(videoGroupId, codecs);
+      }
+    }
+  }
+
   /**
    * Parse Subtitles and Closed Captions from 'EXT-X-MEDIA' tags.
    * Create text streams for Subtitles, but not Closed Captions.
    *
-   * @param {!Array.<shaka.hls.Tag>} tags All tags from the playlist.
+   * @param {!Array.<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
    * @return {!Promise.<!Array.<!shaka.extern.Stream>>}
    * @private
    */
-  async parseTexts_(tags) {
-    const Utils = shaka.hls.Utils;
-    const mediaTags = Utils.filterTagsByName(tags, 'EXT-X-MEDIA');
+  async parseTexts_(mediaTags) {
     // Create text stream for each Subtitle media tag.
-    const subtitleTags = Utils.filterTagsByType(mediaTags, 'SUBTITLES');
+    const subtitleTags =
+        shaka.hls.Utils.filterTagsByType(mediaTags, 'SUBTITLES');
     const textStreamPromises = subtitleTags.map(async (tag) => {
-      const streamInfo = await this.createStreamInfoFromMediaTag_(tag, []);
+      const streamInfo = await this.createStreamInfoFromMediaTag_(tag);
       goog.asserts.assert(
           streamInfo, 'Should always have a streamInfo for text');
       return streamInfo.stream;
     });
     const textStreams = await Promise.all(textStreamPromises);
+
+    // Set the codecs for text streams.
+    for (const tag of subtitleTags) {
+      const groupId = tag.getRequiredAttrValue('GROUP-ID');
+      const codecs = this.groupIdToCodecsMap_.get(groupId);
+      if (codecs) {
+        const textStreamInfos = this.groupIdToStreamInfosMap_.get(groupId);
+        for (const textStreamInfo of textStreamInfos) {
+          textStreamInfo.stream.codecs = codecs;
+        }
+      }
+    }
+
     // Do not create text streams for Closed captions.
     this.parseClosedCaptions_(mediaTags);
-
     return textStreams;
   }
 
   /**
-   * Create variants from an 'EXT-X-STREAM-INF' tag.
-   *
-   * @param {!shaka.hls.Tag} tag
-   * @param {!shaka.hls.Playlist} playlist
-   * @return {!Promise.<!Array.<!shaka.extern.Variant>>}
+   * @param {!Array.<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
    * @private
    */
-  async createVariantsForTag_(tag, playlist) {
-    goog.asserts.assert(tag.name == 'EXT-X-STREAM-INF',
-        'Should only be called on variant tags!');
-    const frameRate = tag.getAttributeValue('FRAME-RATE');
-    const bandwidth = Number(tag.getRequiredAttrValue('BANDWIDTH'));
+  async createStreamInfosFromMediaTags_(mediaTags) {
+    // Filter out subtitles and  media tags without uri.
+    mediaTags = mediaTags.filter((tag) => {
+      const uri = tag.getAttributeValue('URI') || '';
+      const type = tag.getAttributeValue('TYPE');
+      return type != 'SUBTITLES' && uri != '';
+    });
 
-    const resolution = tag.getAttributeValue('RESOLUTION');
-    const [width, height] = resolution ? resolution.split('x') : [null, null];
+    // Create stream info for each audio / video media tag.
+    const promises = mediaTags.map((tag) => {
+      return this.createStreamInfoFromMediaTag_(tag);
+    });
+    await Promise.all(promises);
+  }
 
-    const audioGroupId = tag.getAttributeValue('AUDIO');
-    const videoGroupId = tag.getAttributeValue('VIDEO');
-    goog.asserts.assert(audioGroupId == null || videoGroupId == null,
-        'Unexpected: both video and audio described by media tags!');
+  /**
+   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * @return {!Promise.<!Array.<!shaka.extern.Variant>>}
+   * @private
+   */
+  async createVariantsForTags_(tags) {
+    // Create variants for each variant tag.
+    const variantsPromises = tags.map(async (tag) => {
+      const frameRate = tag.getAttributeValue('FRAME-RATE');
+      const bandwidth = Number(tag.getRequiredAttrValue('BANDWIDTH'));
+
+      const resolution = tag.getAttributeValue('RESOLUTION');
+      const [width, height] = resolution ? resolution.split('x') : [null, null];
+
+      const streamInfos = await this.createStreamInfosForVariantTag_(tag,
+          resolution, frameRate);
+
+      if (streamInfos) {
+        goog.asserts.assert(streamInfos.audio.length ||
+            streamInfos.video.length, 'We should have created a stream!');
+
+        return this.createVariants_(
+            streamInfos.audio,
+            streamInfos.video,
+            bandwidth,
+            width,
+            height,
+            frameRate);
+      }
+      // We do not support AES-128 encryption with HLS yet. If the streamInfos
+      // is null because of AES-128 encryption, do not create variants for that.
+      return [];
+    });
 
-    const mediaTags = this.getMediaTags_(playlist.tags, audioGroupId,
-        videoGroupId);
-    const streamInfos = await this.createStreamInfosForAudioAndVideo_(tag,
-        mediaTags, audioGroupId, videoGroupId, resolution, frameRate);
-
-    if (streamInfos) {
-      goog.asserts.assert(streamInfos.audio.length || streamInfos.video.length,
-          'We should have created a stream!');
-
-      return this.createVariants_(
-          streamInfos.audio,
-          streamInfos.video,
-          bandwidth,
-          width,
-          height,
-          frameRate);
-    }
-    // We do not support AES-128 encryption with HLS yet. If the streamInfos
-    // is null because of AES-128 encryption, do not create variants for that.
-    return [];
+    const allVariants = await Promise.all(variantsPromises);
+    let variants = allVariants.reduce(shaka.util.Functional.collapseArrays, []);
+    // Filter out null variants.
+    variants = variants.filter((variant) => variant != null);
+    return variants;
   }
 
   /**
@@ -580,26 +636,24 @@ shaka.hls.HlsParser = class {
    * related media tags.
    *
    * @param {!shaka.hls.Tag} tag
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags An array of EXT-X-MEDIA tags.
-   * @param {?string} audioGroupId
-   * @param {?string} videoGroupId
    * @param {?string} resolution
    * @param {?string} frameRate
    * @return {!Promise.<?shaka.hls.HlsParser.StreamInfos>}
    * @private
    */
-  async createStreamInfosForAudioAndVideo_(tag, mediaTags, audioGroupId,
-      videoGroupId, resolution, frameRate) {
+  async createStreamInfosForVariantTag_(tag, resolution, frameRate) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     /** @type {!Array.<string>} */
-    let codecs = this.getCodecs_(tag, mediaTags);
+    let allCodecs = this.getCodecsForVariantTag_(tag);
+    const audioGroupId = tag.getAttributeValue('AUDIO');
+    const videoGroupId = tag.getAttributeValue('VIDEO');
+    goog.asserts.assert(audioGroupId == null || videoGroupId == null,
+        'Unexpected: both video and audio described by media tags!');
 
-    const promises = mediaTags.map((tag) => {
-      return this.createStreamInfoFromMediaTag_(tag, codecs);
-    });
-    let streamInfos = await Promise.all(promises);
-    // Filter out null streamInfo.
-    streamInfos = streamInfos.filter((info) => info != null);
+    const groupId = audioGroupId || videoGroupId;
+    const streamInfos =
+        (groupId && this.groupIdToStreamInfosMap_.has(groupId)) ?
+        this.groupIdToStreamInfosMap_.get(groupId) : [];
 
     /** @type {shaka.hls.HlsParser.StreamInfos} */
     const res = {
@@ -622,14 +676,14 @@ shaka.hls.HlsParser = class {
         res.audio.length ? res.audio[0].verbatimMediaPlaylistUri : '';
     const areSameUri = streamURI == firstAudioStreamURI;
 
-    const videoCodecs = this.guessCodecsSafe_(ContentType.VIDEO, codecs);
+    const videoCodecs = this.guessCodecsSafe_(ContentType.VIDEO, allCodecs);
     const hasVideoRelatedInfo = resolution || frameRate || videoCodecs;
 
-    if (!streamInfos.length && codecs.length == 1 && !hasVideoRelatedInfo) {
+    if (!streamInfos.length && allCodecs.length == 1 && !hasVideoRelatedInfo) {
       // There are no associated media tags, and there's only one codec, and no
       // video related information, so it should be audio.
       type = ContentType.AUDIO;
-    } else if (!streamInfos.length && codecs.length > 1) {
+    } else if (!streamInfos.length && allCodecs.length > 1) {
       // There are multiple codecs, so assume multiplexed content.
       // Note that the default used when CODECS is missing assumes multiple
       // (and therefore multiplexed).
@@ -637,7 +691,7 @@ shaka.hls.HlsParser = class {
       // lied to later. (That would trigger an error in Chrome.)
       shaka.log.debug('Guessing multiplexed audio+video.');
       type = ContentType.VIDEO;
-      codecs = [codecs.join(',')];
+      allCodecs = [allCodecs.join(',')];
     } else if (res.audio.length && areSameUri) {
       shaka.log.debug('Guessing audio-only.');
       type = ContentType.AUDIO;
@@ -654,70 +708,29 @@ shaka.hls.HlsParser = class {
     let streamInfo;
     if (!ignoreStream) {
       streamInfo =
-          await this.createStreamInfoFromVariantTag_(tag, codecs, type);
+          await this.createStreamInfoFromVariantTag_(tag, allCodecs, type);
     }
     if (streamInfo) {
-      streamInfo.stream.type == ContentType.AUDIO ?
-        res.audio = [streamInfo] : res.video = [streamInfo];
+      res[streamInfo.stream.type] = [streamInfo];
     } else if (streamInfo === null) {
       // Triple-equals for undefined.
       shaka.log.debug('streamInfo is null');
       return null;
     }
-    this.filterLegacyCodecs_(res.audio);
-    this.filterLegacyCodecs_(res.video);
+    this.filterLegacyCodecs_(res);
     return res;
   }
 
-  /**
-   * Get the 'EXT-X-MEDIA' tags from the playlist tags.
-   *
-   * @param {!Array.<shaka.hls.Tag>} tags
-   * @param {?string} audioGroupId
-   * @param {?string} videoGroupId
-   * @return {!Array.<!shaka.hls.Tag>}
-   * @private
-   */
-  getMediaTags_(tags, audioGroupId, videoGroupId) {
-    // After filtering, this is a list of the media tags we will process to
-    // combine with the variant tag (EXT-X-STREAM-INF) we are working on.
-    let mediaTags =
-        shaka.hls.Utils.filterTagsByName(tags, 'EXT-X-MEDIA');
-
-    // Do not create stream info from closed captions media tags, which are
-    // embedded in video streams. Closed captions must not have uri, so they'll
-    // be filtered out.
-    // AUDIO or VIDEO tags without a URI attribute are valid. It means that
-    // audio/video is embedded in the stream described by the Variant tag.
-    // Do not create stream from AUDIO/VIDEO EXT-X-MEDIA tags without URI.
-    mediaTags = mediaTags.filter((tag) => {
-      const uri = tag.getAttributeValue('URI') || '';
-      const type = tag.getAttributeValue('TYPE') || '';
-      return type == 'SUBTITLES' || uri != '';
-    });
-
-    // Find any associated audio or video groups and create streams for them.
-    if (audioGroupId) {
-      mediaTags =
-          shaka.hls.Utils.findMediaTags(mediaTags, 'AUDIO', audioGroupId);
-    } else if (videoGroupId) {
-      mediaTags =
-          shaka.hls.Utils.findMediaTags(mediaTags, 'VIDEO', videoGroupId);
-    }
-    return mediaTags;
-  }
 
   /**
    * Get the codecs from the 'EXT-X-STREAM-INF' tag.
    *
    * @param {!shaka.hls.Tag} tag
-   * @param {!Array.<shaka.hls.Tag>} mediaTags
    * @return {!Array.<string>} codecs
    * @private
    */
-  getCodecs_(tag, mediaTags) {
+  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.
@@ -726,10 +739,26 @@ shaka.hls.HlsParser = class {
     const codecsString = tag.getAttributeValue('CODECS', defaultCodecs);
     // Strip out internal whitespace while splitting on commas:
     /** @type {!Array.<string>} */
-    const codecs =
-      shaka.hls.HlsParser.filterDuplicateCodecs_(codecsString.split(/\s*,\s*/));
-    this.filterOutTextCodecs_(tag, mediaTags, codecs);
-    return codecs;
+    const codecs = codecsString.split(/\s*,\s*/);
+
+    // Filter out duplicate codecs.
+    const seen = new Set();
+    const ret = [];
+    for (const codec of codecs) {
+      // HLS says the CODECS field needs to include all codecs that appear in
+      // the content. This means that if the content changes profiles, it should
+      // include both. Since all known browsers support changing profiles
+      // without any other work, just ignore them.  See also:
+      // https://github.com/google/shaka-player/issues/1817
+      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
+      if (!seen.has(shortCodec)) {
+        ret.push(codec);
+        seen.add(shortCodec);
+      } else {
+        shaka.log.debug('Ignoring duplicate codec');
+      }
+    }
+    return ret;
   }
 
   /**
@@ -807,50 +836,13 @@ shaka.hls.HlsParser = class {
     return type;
   }
 
-  /**
-   * Identify codec string for text stream, add it to the appropriate
-   * stream info, then strip it out of the variant to avoid confusing our
-   * multiplex detection.
-   *
-   * @param {!shaka.hls.Tag} tag
-   * @param {!Array.<shaka.hls.Tag>} mediaTags
-   * @param {!Array.<string>} codecs
-   * @private
-   */
-  filterOutTextCodecs_(tag, mediaTags, codecs) {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
-    const textCodecs = this.guessCodecsSafe_(ContentType.TEXT, codecs);
-    if (textCodecs) {
-      // We found a text codec in the list, so look for an associated text
-      // stream.
-      const subGroupId = tag.getAttributeValue('SUBTITLES');
-      if (subGroupId) {
-        const textTags =
-            shaka.hls.Utils.findMediaTags(mediaTags, 'SUBTITLES', subGroupId);
-        goog.asserts.assert(textTags.length == 1,
-            'Exactly one text tag expected!');
-        if (textTags.length) {
-          // We found a text codec and text stream, so make sure the codec is
-          // attached to the stream.
-          const textStreamInfo =
-          this.mediaTagsToStreamInfosMap_.get(textTags[0].id);
-          textStreamInfo.stream.codecs = textCodecs;
-        }
-      }
-
-      // Remove this entry from the list of codecs that belong to audio/video.
-      shaka.util.ArrayUtils.remove(codecs, textCodecs);
-    }
-  }
-
   /**
    * Filters out unsupported codec strings from an array of stream infos.
-   * @param {!Array.<shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {shaka.hls.HlsParser.StreamInfos} streamInfos
    * @private
    */
   filterLegacyCodecs_(streamInfos) {
-    for (const streamInfo of streamInfos) {
+    for (const streamInfo of streamInfos.audio.concat(streamInfos.video)) {
       let codecs = streamInfo.stream.codecs.split(',');
       codecs = codecs.filter((codec) => {
         // mp4a.40.34 is a nonstandard codec string that is sometimes used in
@@ -874,6 +866,7 @@ shaka.hls.HlsParser = class {
    * @private
    */
   createVariants_(audioInfos, videoInfos, bandwidth, width, height, frameRate) {
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const DrmEngine = shaka.media.DrmEngine;
 
     for (const info of videoInfos) {
@@ -927,8 +920,26 @@ shaka.hls.HlsParser = class {
           continue;
         }
 
-        const variant = this.createVariant_(
-            audioStream, videoStream, bandwidth, drmInfos);
+        // Since both audio and video are of the same type, this assertion will
+        // catch certain mistakes at runtime that the compiler would miss.
+        goog.asserts.assert(!audioStream ||
+            audioStream.type == ContentType.AUDIO, 'Audio parameter mismatch!');
+        goog.asserts.assert(!videoStream ||
+            videoStream.type == ContentType.VIDEO, 'Video parameter mismatch!');
+
+        const variant = {
+          id: this.globalId_++,
+          language: audioStream ? audioStream.language : 'und',
+          primary: (!!audioStream && audioStream.primary) ||
+              (!!videoStream && videoStream.primary),
+          audio: audioStream,
+          video: videoStream,
+          bandwidth: bandwidth,
+          drmInfos: drmInfos,
+          allowedByApplication: true,
+          allowedByKeySystem: true,
+        };
+
         variants.push(variant);
         this.variantUriSet_.add(variantUriKey);
       }
@@ -936,42 +947,11 @@ shaka.hls.HlsParser = class {
     return variants;
   }
 
-  /**
-   * @param {shaka.extern.Stream} audio
-   * @param {shaka.extern.Stream} video
-   * @param {number} bandwidth
-   * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
-   * @return {!shaka.extern.Variant}
-   * @private
-   */
-  createVariant_(audio, video, bandwidth, drmInfos) {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
-
-    // Since both audio and video are of the same type, this assertion will
-    // catch certain mistakes at runtime that the compiler would miss.
-    goog.asserts.assert(!audio || audio.type == ContentType.AUDIO,
-        'Audio parameter mismatch!');
-    goog.asserts.assert(!video || video.type == ContentType.VIDEO,
-        'Video parameter mismatch!');
-
-    return {
-      id: this.globalId_++,
-      language: audio ? audio.language : 'und',
-      primary: (!!audio && audio.primary) || (!!video && video.primary),
-      audio: audio,
-      video: video,
-      bandwidth: bandwidth,
-      drmInfos: drmInfos,
-      allowedByApplication: true,
-      allowedByKeySystem: true,
-    };
-  }
-
   /**
    * Parses an array of EXT-X-MEDIA tags, then stores the values of all tags
    * with TYPE="CLOSED-CAPTIONS" into a map of group id to closed captions.
    *
-   * @param {!Array.<shaka.hls.Tag>} mediaTags
+   * @param {!Array.<!shaka.hls.Tag>} mediaTags
    * @private
    */
   parseClosedCaptions_(mediaTags) {
@@ -1001,13 +981,21 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @param {!Array.<string>} allCodecs
    * @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
-  async createStreamInfoFromMediaTag_(tag, allCodecs) {
+  async createStreamInfoFromMediaTag_(tag) {
     goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
         'Should only be called on media tags!');
+    const groupId = tag.getRequiredAttrValue('GROUP-ID');
+    let codecs = '';
+    /** @type {string} */
+    const type = this.getType_(tag);
+    // Text does not require a codec.
+    if (type != shaka.util.ManifestParserUtils.ContentType.TEXT && groupId &&
+        this.groupIdToCodecsMap_.has(groupId)) {
+      codecs = this.groupIdToCodecsMap_.get(groupId);
+    }
 
     const verbatimMediaPlaylistUri = tag.getRequiredAttrValue('URI');
 
@@ -1017,7 +1005,6 @@ shaka.hls.HlsParser = class {
       return this.uriToStreamInfosMap_.get(verbatimMediaPlaylistUri);
     }
 
-    const type = this.getType_(tag);
     const language = this.getLanguage_(tag);
     const name = tag.getAttributeValue('NAME');
     const defaultAttr = tag.getAttribute('DEFAULT');
@@ -1028,18 +1015,22 @@ shaka.hls.HlsParser = class {
     // attributes: FORCED, INSTREAM-ID, CHARACTERISTICS? Attribute
     // descriptions: https://bit.ly/2lpjOhj
     const streamInfo = await this.createStreamInfo_(
-        verbatimMediaPlaylistUri, allCodecs, type, language, primary, name,
+        verbatimMediaPlaylistUri, codecs, type, language, primary, name,
         channelsCount, /* closedCaptions */ null);
     if (streamInfo == null) {
       return null;
     }
+
+    if (this.groupIdToStreamInfosMap_.has(groupId)) {
+      this.groupIdToStreamInfosMap_.get(groupId).push(streamInfo);
+    } else {
+      this.groupIdToStreamInfosMap_.set(groupId, [streamInfo]);
+    }
     // TODO: This check is necessary because of the possibility of multiple
     // calls to createStreamInfoFromMediaTag_ before either has resolved.
     if (this.uriToStreamInfosMap_.has(verbatimMediaPlaylistUri)) {
       return this.uriToStreamInfosMap_.get(verbatimMediaPlaylistUri);
     }
-    this.mediaTagsToStreamInfosMap_.set(tag.id, streamInfo);
-
     this.uriToStreamInfosMap_.set(verbatimMediaPlaylistUri, streamInfo);
     return streamInfo;
   }
@@ -1063,9 +1054,9 @@ shaka.hls.HlsParser = class {
     }
 
     const closedCaptions = this.getClosedCaptions_(tag, type);
-
+    const codecs = this.guessCodecs_(type, allCodecs);
     const streamInfo = await this.createStreamInfo_(verbatimMediaPlaylistUri,
-        allCodecs, type, /* language */ 'und', /* primary */ false,
+        codecs, type, /* language */ 'und', /* primary */ false,
         /* name */ null, /* channelcount */ null, closedCaptions);
     if (streamInfo == null) {
       return null;
@@ -1083,7 +1074,7 @@ shaka.hls.HlsParser = class {
 
   /**
    * @param {string} verbatimMediaPlaylistUri
-   * @param {!Array.<string>} allCodecs
+   * @param {string} codecs
    * @param {string} type
    * @param {string} language
    * @param {boolean} primary
@@ -1094,7 +1085,7 @@ shaka.hls.HlsParser = class {
    * @throws shaka.util.Error
    * @private
    */
-  async createStreamInfo_(verbatimMediaPlaylistUri, allCodecs, type, language,
+  async createStreamInfo_(verbatimMediaPlaylistUri, codecs, type, language,
       primary, name, channelsCount, closedCaptions) {
     // TODO: Refactor, too many parameters
     let absoluteMediaPlaylistUri = shaka.hls.Utils.constructAbsoluteUri(
@@ -1177,9 +1168,6 @@ shaka.hls.HlsParser = class {
 
     this.determinePresentationType_(playlist);
 
-    /** @type {string} */
-    const codecs = this.guessCodecs_(type, allCodecs);
-
     /** @type {string} */
     const mimeType = await this.guessMimeType_(type, codecs, playlist);
 
@@ -1873,32 +1861,6 @@ shaka.hls.HlsParser = class {
     return textEngine.getStartTime(response.data);
   }
 
-  /**
-   * Filters out duplicate codecs from the codec list.
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>}
-   * @private
-   */
-  static filterDuplicateCodecs_(codecs) {
-    const seen = new Set();
-    const ret = [];
-    for (const codec of codecs) {
-      // HLS says the CODECS field needs to include all codecs that appear in
-      // the content. This means that if the content changes profiles, it should
-      // include both. Since all known browsers support changing profiles
-      // without any other work, just ignore them  See also:
-      // https://github.com/google/shaka-player/issues/1817
-      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
-      if (!seen.has(shortCodec)) {
-        ret.push(codec);
-        seen.add(shortCodec);
-      } else {
-        shaka.log.debug('Ignoring duplicate codec');
-      }
-    }
-    return ret;
-  }
-
   /**
    * Attempts to guess which codecs from the codecs list belong to a given
    * content type.
@@ -1941,10 +1903,8 @@ shaka.hls.HlsParser = class {
    * @private
    */
   guessCodecsSafe_(contentType, codecs) {
-    const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const formats =
         shaka.hls.HlsParser.CODEC_REGEXPS_BY_CONTENT_TYPE_[contentType];
-
     for (const format of formats) {
       for (const codec of codecs) {
         if (format.test(codec.trim())) {
@@ -1954,7 +1914,7 @@ shaka.hls.HlsParser = class {
     }
 
     // Text does not require a codec string.
-    if (contentType == ContentType.TEXT) {
+    if (contentType == shaka.util.ManifestParserUtils.ContentType.TEXT) {
       return '';
     }
 
diff --git a/test/hls/hls_live_unit.js b/test/hls/hls_live_unit.js
index ffc8cbf33c..83d1e1e35f 100644
--- a/test/hls/hls_live_unit.js
+++ b/test/hls/hls_live_unit.js
@@ -472,9 +472,10 @@ describe('HlsParser live', () => {
     it('offsets VTT text with rolled over TS timestamps', async () => {
       const masterWithVtt = [
         '#EXTM3U\n',
-        '#EXT-X-MEDIA:TYPE=SUBTITLES,LANGUAGE="fra",URI="text"\n',
+        '#EXT-X-MEDIA:TYPE=SUBTITLES,LANGUAGE="fra",URI="text",',
+        'GROUP-ID="sub1"\n',
         '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
-        'RESOLUTION=960x540,FRAME-RATE=60\n',
+        'RESOLUTION=960x540,FRAME-RATE=60,SUBTITLES="sub1"\n',
         'video\n',
       ].join('');
 
@@ -683,9 +684,10 @@ describe('HlsParser live', () => {
       it('handles rollover on update', async () => {
         const masterWithVtt = [
           '#EXTM3U\n',
-          '#EXT-X-MEDIA:TYPE=SUBTITLES,LANGUAGE="fra",URI="text"\n',
+          '#EXT-X-MEDIA:TYPE=SUBTITLES,LANGUAGE="fra",URI="text",',
+          'GROUP-ID="sub1"\n',
           '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
-          'RESOLUTION=960x540,FRAME-RATE=60\n',
+          'RESOLUTION=960x540,FRAME-RATE=60,SUBTITLES="sub1"\n',
           'video\n',
         ].join('');
 
diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
index 181bd8a944..0d35830bcf 100644
--- a/test/hls/hls_parser_unit.js
+++ b/test/hls/hls_parser_unit.js
@@ -1569,7 +1569,7 @@ describe('HlsParser', () => {
           '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
           '#EXTINF:5,\n',
           '#EXT-X-BYTERANGE:121090@616\n',
-          'main.exe',
+          'main.mp4',
         ].join('');
 
         await verifyMissingAttribute(master, media, 'BANDWIDTH');