Group audio renditions by name

Allows the player to adapt between audio renditions with different
names.

PiperOrigin-RevId: 233052105

RELEASENOTES.md

@@ -2,6 +2,8 @@
 
 
 ### dev-v2 (not yet released) ###
 ### dev-v2 (not yet released) ###
 
 
+* HLS:
+  * Form an adaptive track group out of audio renditions with matching name.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * `ExtractorMediaSource` renamed to `ProgressiveMediaSource`.
 * Support for playing spherical videos on Daydream.
 * Support for playing spherical videos on Daydream.
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post
 * Improve decoder re-use between playbacks. TODO: Write and link a blog post

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -67,6 +67,9 @@ import java.util.List;
 
 
     /**
     /**
      * Called when the wrapper has been prepared.
      * Called when the wrapper has been prepared.
+     *
+     * <p>Note: This method will be called on a later handler loop than the one on which either
+     * {@link #prepareWithMasterPlaylistInfo} or {@link #continuePreparing} are invoked.
      */
      */
     void onPrepared();
     void onPrepared();
 
 
@@ -203,7 +206,7 @@ import java.util.List;
     this.trackGroups = trackGroups;
     this.trackGroups = trackGroups;
     this.optionalTrackGroups = optionalTrackGroups;
     this.optionalTrackGroups = optionalTrackGroups;
     this.primaryTrackGroupIndex = primaryTrackGroupIndex;
     this.primaryTrackGroupIndex = primaryTrackGroupIndex;
-    callback.onPrepared();
+    handler.post(callback::onPrepared);
   }
   }
 
 
   public void maybeThrowPrepareError() throws IOException {
   public void maybeThrowPrepareError() throws IOException {

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java

@@ -56,6 +56,11 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
      * Format information associated with the HLS url.
      * Format information associated with the HLS url.
      */
      */
     public final Format format;
     public final Format format;
+    /**
+     * Value of the NAME attribute as defined by the #EXT-X-MEDIA tag, or empty if the HLS url is
+     * not associated with any name.
+     */
+    public final String name;
 
 
     /**
     /**
      * Creates an HLS url from a given http url.
      * Creates an HLS url from a given http url.
@@ -74,16 +79,18 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
               /* bitrate= */ Format.NO_VALUE,
               /* bitrate= */ Format.NO_VALUE,
               /* selectionFlags= */ 0,
               /* selectionFlags= */ 0,
               /* language= */ null);
               /* language= */ null);
-      return new HlsUrl(url, format);
+      return new HlsUrl(url, format, /* name= */ "");
     }
     }
 
 
     /**
     /**
      * @param url See {@link #url}.
      * @param url See {@link #url}.
      * @param format See {@link #format}.
      * @param format See {@link #format}.
+     * @param name See {@link #name}.
      */
      */
-    public HlsUrl(String url, Format format) {
+    public HlsUrl(String url, Format format, String name) {
       this.url = url;
       this.url = url;
       this.format = format;
       this.format = format;
+      this.name = name;
     }
     }
 
 
   }
   }

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java

@@ -330,7 +330,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   frameRate,
                   frameRate,
                   /* initializationData= */ null,
                   /* initializationData= */ null,
                   /* selectionFlags= */ 0);
                   /* selectionFlags= */ 0);
-          variants.add(new HlsMasterPlaylist.HlsUrl(line, format));
+          variants.add(new HlsMasterPlaylist.HlsUrl(line, format, /* name= */ ""));
         }
         }
       }
       }
     }
     }
@@ -365,7 +365,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
           if (isMediaTagMuxed(variants, uri)) {
           if (isMediaTagMuxed(variants, uri)) {
             muxedAudioFormat = format;
             muxedAudioFormat = format;
           } else {
           } else {
-            audios.add(new HlsMasterPlaylist.HlsUrl(uri, format));
+            audios.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
           }
           }
           break;
           break;
         case TYPE_SUBTITLES:
         case TYPE_SUBTITLES:
@@ -379,7 +379,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
                   /* bitrate= */ Format.NO_VALUE,
                   /* bitrate= */ Format.NO_VALUE,
                   selectionFlags,
                   selectionFlags,
                   language);
                   language);
-          subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format));
+          subtitles.add(new HlsMasterPlaylist.HlsUrl(uri, format, name));
           break;
           break;
         case TYPE_CLOSED_CAPTIONS:
         case TYPE_CLOSED_CAPTIONS:
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);
           String instreamId = parseStringAttr(line, REGEX_INSTREAM_ID, variableDefinitions);

library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java

@@ -49,7 +49,7 @@ import org.robolectric.annotation.Config;
 public final class HlsMediaPeriodTest {
 public final class HlsMediaPeriodTest {
 
 
   @Test
   @Test
-  public void getSteamKeys_isCompatibleWithhHlsMasterPlaylistFilter() {
+  public void getSteamKeys_isCompatibleWithHlsMasterPlaylistFilter() {
     HlsMasterPlaylist testMasterPlaylist =
     HlsMasterPlaylist testMasterPlaylist =
         createMasterPlaylist(
         createMasterPlaylist(
             /* variants= */ Arrays.asList(
             /* variants= */ Arrays.asList(
@@ -127,7 +127,8 @@ public final class HlsMediaPeriodTest {
             /* height= */ Format.NO_VALUE,
             /* height= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
             /* initializationData= */ null,
-            /* selectionFlags= */ 0));
+            /* selectionFlags= */ 0),
+        /* name= */ "");
   }
   }
 
 
   private static HlsUrl createAudioOnlyVariantHlsUrl(int bitrate) {
   private static HlsUrl createAudioOnlyVariantHlsUrl(int bitrate) {
@@ -144,15 +145,16 @@ public final class HlsMediaPeriodTest {
             /* height= */ Format.NO_VALUE,
             /* height= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* frameRate= */ Format.NO_VALUE,
             /* initializationData= */ null,
             /* initializationData= */ null,
-            /* selectionFlags= */ 0));
+            /* selectionFlags= */ 0),
+        /* name= */ "");
   }
   }
 
 
   private static HlsUrl createAudioHlsUrl(String language) {
   private static HlsUrl createAudioHlsUrl(String language) {
-    return new HlsUrl("http://url", createAudioFormat(language));
+    return new HlsUrl("http://url", createAudioFormat(language), /* name= */ "");
   }
   }
 
 
   private static HlsUrl createSubtitleHlsUrl(String language) {
   private static HlsUrl createSubtitleHlsUrl(String language) {
-    return new HlsUrl("http://url", createSubtitleFormat(language));
+    return new HlsUrl("http://url", createSubtitleFormat(language), /* name= */ "");
   }
   }
 
 
   private static Format createAudioFormat(String language) {
   private static Format createAudioFormat(String language) {