🚑 (HLS): Add support for multiple tracks of same type; ref T6222 Clie…

…nt software & devices

Issue on github: google#2014
Original commit: stari4ek@ce66b33

Auditors: alex3d

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java

@@ -114,6 +114,9 @@ public final class TsExtractor implements Extractor {
   private static final int BUFFER_SIZE = TS_PACKET_SIZE * 50;
   private static final int SNIFF_TS_PACKET_COUNT = 5;
 
+  // Custom fix: https://github.com/google/ExoPlayer/issues/2014
+  public static boolean HLS_MULTIPLE_TRACKS_ALLOWED = true;
+
   private final @Mode int mode;
   private final int timestampSearchBytes;
   private final List<TimestampAdjuster> timestampAdjusters;
@@ -635,7 +638,8 @@ public void consume(ParsableByteArray sectionData) {
         }
         remainingEntriesLength -= esInfoLength + 5;
 
-        int trackId = mode == MODE_HLS ? streamType : elementaryPid;
+        // Custom fix: https://github.com/google/ExoPlayer/issues/2014
+        int trackId = mode == MODE_HLS && !HLS_MULTIPLE_TRACKS_ALLOWED ? streamType : elementaryPid;
         if (trackIds.get(trackId)) {
           continue;
         }

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

@@ -117,10 +117,8 @@ public interface Callback extends SequenceableLoader.Callback<HlsSampleStreamWra
   public static final int SAMPLE_QUEUE_INDEX_NO_MAPPING_FATAL = -2;
   public static final int SAMPLE_QUEUE_INDEX_NO_MAPPING_NON_FATAL = -3;
 
-  private static final Set<Integer> MAPPABLE_TYPES =
-      Collections.unmodifiableSet(
-          new HashSet<>(
-              Arrays.asList(C.TRACK_TYPE_AUDIO, C.TRACK_TYPE_VIDEO, C.TRACK_TYPE_METADATA)));
+  // Custom fix: https://github.com/google/ExoPlayer/issues/2014
+  private static final Set<Integer> MAPPABLE_TYPES = Collections.emptySet();
 
   private final int trackType;
   private final Callback callback;