Rollback of https://github.com/google/ExoPlayer/commit/fdfe631850908e1e4b8641d5ef2f084a39f2347d

*** Original commit ***

Remove null-ness of muxedCaptionFormats list

Pre-work for removing HlsMasterPlaylist and HlsPlaylistParser from null-checking
blacklist.

***

PiperOrigin-RevId: 274591502

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

@@ -635,9 +635,11 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
                       /* isPrimaryTrackInVariant= */ false)));
                       /* isPrimaryTrackInVariant= */ false)));
         }
         }
         List<Format> ccFormats = masterPlaylist.muxedCaptionFormats;
         List<Format> ccFormats = masterPlaylist.muxedCaptionFormats;
+        if (ccFormats != null) {
           for (int i = 0; i < ccFormats.size(); i++) {
           for (int i = 0; i < ccFormats.size(); i++) {
             muxedTrackGroups.add(new TrackGroup(ccFormats.get(i)));
             muxedTrackGroups.add(new TrackGroup(ccFormats.get(i)));
           }
           }
+        }
       } else if (variantsContainAudioCodecs) {
       } else if (variantsContainAudioCodecs) {
         // Variants only contain audio.
         // Variants only contain audio.
         Format[] audioFormats = new Format[selectedVariantsCount];
         Format[] audioFormats = new Format[selectedVariantsCount];

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

@@ -177,7 +177,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
   @Nullable public final Format muxedAudioFormat;
   @Nullable public final Format muxedAudioFormat;
   /**
   /**
    * The format of the closed captions declared by the playlist. May be empty if the playlist
    * The format of the closed captions declared by the playlist. May be empty if the playlist
-   * doesn't declare any caption information or explicitly declares no captions are available.
+   * explicitly declares no captions are available, or null if the playlist does not declare any
+   * captions information.
    */
    */
   public final List<Format> muxedCaptionFormats;
   public final List<Format> muxedCaptionFormats;
   /** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */
   /** Contains variable definitions, as defined by the #EXT-X-DEFINE tag. */
@@ -222,7 +223,8 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
     this.subtitles = Collections.unmodifiableList(subtitles);
     this.subtitles = Collections.unmodifiableList(subtitles);
     this.closedCaptions = Collections.unmodifiableList(closedCaptions);
     this.closedCaptions = Collections.unmodifiableList(closedCaptions);
     this.muxedAudioFormat = muxedAudioFormat;
     this.muxedAudioFormat = muxedAudioFormat;
-    this.muxedCaptionFormats = Collections.unmodifiableList(muxedCaptionFormats);
+    this.muxedCaptionFormats = muxedCaptionFormats != null
+        ? Collections.unmodifiableList(muxedCaptionFormats) : null;
     this.variableDefinitions = Collections.unmodifiableMap(variableDefinitions);
     this.variableDefinitions = Collections.unmodifiableMap(variableDefinitions);
     this.sessionKeyDrmInitData = Collections.unmodifiableList(sessionKeyDrmInitData);
     this.sessionKeyDrmInitData = Collections.unmodifiableList(sessionKeyDrmInitData);
   }
   }
@@ -264,7 +266,7 @@ public final class HlsMasterPlaylist extends HlsPlaylist {
         /* subtitles= */ Collections.emptyList(),
         /* subtitles= */ Collections.emptyList(),
         /* closedCaptions= */ Collections.emptyList(),
         /* closedCaptions= */ Collections.emptyList(),
         /* muxedAudioFormat= */ null,
         /* muxedAudioFormat= */ null,
-        /* muxedCaptionFormats= */ Collections.emptyList(),
+        /* muxedCaptionFormats= */ null,
         /* hasIndependentSegments= */ false,
         /* hasIndependentSegments= */ false,
         /* variableDefinitions= */ Collections.emptyMap(),
         /* variableDefinitions= */ Collections.emptyMap(),
         /* sessionKeyDrmInitData= */ Collections.emptyList());
         /* sessionKeyDrmInitData= */ Collections.emptyList());

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

@@ -267,7 +267,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     ArrayList<DrmInitData> sessionKeyDrmInitData = new ArrayList<>();
     ArrayList<DrmInitData> sessionKeyDrmInitData = new ArrayList<>();
     ArrayList<String> tags = new ArrayList<>();
     ArrayList<String> tags = new ArrayList<>();
     Format muxedAudioFormat = null;
     Format muxedAudioFormat = null;
-    List<Format> muxedCaptionFormats = new ArrayList<>();
+    List<Format> muxedCaptionFormats = null;
     boolean noClosedCaptions = false;
     boolean noClosedCaptions = false;
     boolean hasIndependentSegmentsTag = false;
     boolean hasIndependentSegmentsTag = false;
 
 
@@ -494,6 +494,9 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             mimeType = MimeTypes.APPLICATION_CEA708;
             mimeType = MimeTypes.APPLICATION_CEA708;
             accessibilityChannel = Integer.parseInt(instreamId.substring(7));
             accessibilityChannel = Integer.parseInt(instreamId.substring(7));
           }
           }
+          if (muxedCaptionFormats == null) {
+            muxedCaptionFormats = new ArrayList<>();
+          }
           muxedCaptionFormats.add(
           muxedCaptionFormats.add(
               Format.createTextContainerFormat(
               Format.createTextContainerFormat(
                   /* id= */ formatId,
                   /* id= */ formatId,
@@ -515,7 +518,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
     }
     }
 
 
     if (noClosedCaptions) {
     if (noClosedCaptions) {
-      muxedCaptionFormats.clear();
+      muxedCaptionFormats = Collections.emptyList();
     }
     }
 
 
     return new HlsMasterPlaylist(
     return new HlsMasterPlaylist(

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

@@ -200,7 +200,7 @@ public class HlsMasterPlaylistParserTest {
 
 
     List<HlsMasterPlaylist.Variant> variants = masterPlaylist.variants;
     List<HlsMasterPlaylist.Variant> variants = masterPlaylist.variants;
     assertThat(variants).hasSize(5);
     assertThat(variants).hasSize(5);
-    assertThat(masterPlaylist.muxedCaptionFormats).isEmpty();
+    assertThat(masterPlaylist.muxedCaptionFormats).isNull();
 
 
     assertThat(variants.get(0).format.bitrate).isEqualTo(1280000);
     assertThat(variants.get(0).format.bitrate).isEqualTo(1280000);
     assertThat(variants.get(0).format.codecs).isEqualTo("mp4a.40.2,avc1.66.30");
     assertThat(variants.get(0).format.codecs).isEqualTo("mp4a.40.2,avc1.66.30");

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

@@ -456,7 +456,7 @@ public class HlsMediaPlaylistParserTest {
             /* subtitles= */ Collections.emptyList(),
             /* subtitles= */ Collections.emptyList(),
             /* closedCaptions= */ Collections.emptyList(),
             /* closedCaptions= */ Collections.emptyList(),
             /* muxedAudioFormat= */ null,
             /* muxedAudioFormat= */ null,
-            /* muxedCaptionFormats= */ Collections.emptyList(),
+            /* muxedCaptionFormats= */ null,
             /* hasIndependentSegments= */ true,
             /* hasIndependentSegments= */ true,
             /* variableDefinitions= */ Collections.emptyMap(),
             /* variableDefinitions= */ Collections.emptyMap(),
             /* sessionKeyDrmInitData= */ Collections.emptyList());
             /* sessionKeyDrmInitData= */ Collections.emptyList());