Refactor DTS audio mime type checks and fix effectively private warnings

Author: rohitjoins

libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java

@@ -244,6 +244,15 @@ private DtsHeader(
   /** Header size length table for DTS UHD. See ETSI TS 103 491 V1.2.1 (2019-05), Section 6.4.3. */
   private static final int[] UHD_HEADER_SIZE_LENGTH_TABLE = new int[] {5, 8, 10, 12};
 
+  /**
+   * Returns whether {@code mimeType} is {@link MimeTypes#AUDIO_DTS} or {@link
+   * MimeTypes#AUDIO_DTS_HD}.
+   */
+  public static boolean isDtsBaseAudioMimeType(@Nullable String mimeType) {
+    return Objects.equals(mimeType, MimeTypes.AUDIO_DTS)
+        || Objects.equals(mimeType, MimeTypes.AUDIO_DTS_HD);
+  }
+
   /**
    * Returns the {@link FrameType} if {@code word} is a DTS sync word, otherwise {@link
    * #FRAME_TYPE_UNKNOWN}.

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java

@@ -1852,18 +1852,13 @@ private boolean readSample(ExtractorInput input) throws IOException {
         }
       }
     } else {
-      if (trackBundle.pendingFormat != null
-          && (Objects.equals(track.format.sampleMimeType, MimeTypes.AUDIO_DTS)
-              || Objects.equals(track.format.sampleMimeType, MimeTypes.AUDIO_DTS_HD))) {
+      Format pendingFormat = trackBundle.pendingFormat;
+      if (pendingFormat != null && DtsUtil.isDtsBaseAudioMimeType(track.format.sampleMimeType)) {
         trackBundle.baseFormat =
             DtsUtil.updateFormatWithDtsHdInfo(input, sampleSize, trackBundle.baseFormat);
-        Format pendingFormat =
-            trackBundle
-                .baseFormat
-                .buildUpon()
-                .setDrmInitData(trackBundle.pendingFormat.drmInitData)
-                .build();
-        trackBundle.output.format(pendingFormat);
+        Format outputFormat =
+            trackBundle.baseFormat.buildUpon().setDrmInitData(pendingFormat.drmInitData).build();
+        trackBundle.output.format(outputFormat);
         trackBundle.pendingFormat = null;
       }
       while (sampleBytesWritten < sampleSize) {
@@ -2317,15 +2312,16 @@ private static final class TrackBundle {
     public int currentTrackRunIndex;
     public int firstSampleToOutputIndex;
 
+    private final ParsableByteArray encryptionSignalByte;
+    private final ParsableByteArray defaultInitializationVector;
+
     /**
      * A {@link Format} that needs to be passed to {@link #output}, after being possibly modified
      * based on sample data, before {@link TrackOutput#sampleMetadata} is called.
      */
-    @Nullable public Format pendingFormat;
+    @Nullable private Format pendingFormat;
 
     private Format baseFormat;
-    private final ParsableByteArray encryptionSignalByte;
-    private final ParsableByteArray defaultInitializationVector;
 
     private boolean currentlyInFragment;
 
@@ -2342,8 +2338,7 @@ public TrackBundle(
       scratch = new ParsableByteArray();
       encryptionSignalByte = new ParsableByteArray(1);
       defaultInitializationVector = new ParsableByteArray();
-      if (Objects.equals(baseFormat.sampleMimeType, MimeTypes.AUDIO_DTS)
-          || Objects.equals(baseFormat.sampleMimeType, MimeTypes.AUDIO_DTS_HD)) {
+      if (DtsUtil.isDtsBaseAudioMimeType(baseFormat.sampleMimeType)) {
         pendingFormat = baseFormat;
       }
       reset(moovSampleTable, defaultSampleValues);

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java

@@ -749,10 +749,9 @@ private void processMoovAtom(ContainerBox moov) throws ParserException {
       // DTS-HD and DTS Express. So we store the format with a placeholder MIME for now, and then
       // update the MIME type and pass it to TrackOutput.format(...) based on the info in the first
       // sample.
-      boolean needSamplesForMime =
+      boolean needsSamplesForMimeType =
           Objects.equals(track.format.sampleMimeType, MimeTypes.AUDIO_MPEG)
-              || Objects.equals(track.format.sampleMimeType, MimeTypes.AUDIO_DTS)
-              || Objects.equals(track.format.sampleMimeType, MimeTypes.AUDIO_DTS_HD);
+              || DtsUtil.isDtsBaseAudioMimeType(track.format.sampleMimeType);
       boolean needsChapterMetadata = false;
       if (!omitTrackSampleTable && track.chapterTrackId != C.INDEX_UNSET) {
         for (TrackSampleTable chapterSampleTable : chapterSampleTables) {
@@ -762,7 +761,7 @@ private void processMoovAtom(ContainerBox moov) throws ParserException {
           }
         }
       }
-      if (needSamplesForMime || needsChapterMetadata) {
+      if (needsSamplesForMimeType || needsChapterMetadata) {
         mp4Track.pendingFormat = format;
       } else {
         mp4Track.trackOutput.format(format);
@@ -1018,15 +1017,16 @@ private int readSample(ExtractorInput input, PositionHolder positionHolder) thro
                     .build()
                 : pendingFormat);
         track.pendingFormat = null;
-      } else if (track.pendingFormat != null
-          && (Objects.equals(track.track.format.sampleMimeType, MimeTypes.AUDIO_DTS)
-              || Objects.equals(track.track.format.sampleMimeType, MimeTypes.AUDIO_DTS_HD))) {
+      } else {
         Format pendingFormat = track.pendingFormat;
-        track.trackOutput.format(
-            DtsUtil.updateFormatWithDtsHdInfo(input, sampleSize, pendingFormat));
-        track.pendingFormat = null;
-      } else if (trueHdSampleRechunker != null) {
-        trueHdSampleRechunker.startSample(input);
+        if (pendingFormat != null
+            && DtsUtil.isDtsBaseAudioMimeType(track.track.format.sampleMimeType)) {
+          track.trackOutput.format(
+              DtsUtil.updateFormatWithDtsHdInfo(input, sampleSize, pendingFormat));
+          track.pendingFormat = null;
+        } else if (trueHdSampleRechunker != null) {
+          trueHdSampleRechunker.startSample(input);
+        }
       }
 
       while (sampleBytesWritten < sampleSize) {
@@ -1119,8 +1119,7 @@ private int readQuickTimeChapters(ExtractorInput input, PositionHolder seekPosit
         // determine the exact MIME type). We have now applied the chapter metadata, so we can
         // output the format, unless it is also MPEG or DTS audio.
         if (Objects.equals(updatedFormat.sampleMimeType, MimeTypes.AUDIO_MPEG)
-            || Objects.equals(updatedFormat.sampleMimeType, MimeTypes.AUDIO_DTS)
-            || Objects.equals(updatedFormat.sampleMimeType, MimeTypes.AUDIO_DTS_HD)) {
+            || DtsUtil.isDtsBaseAudioMimeType(updatedFormat.sampleMimeType)) {
           track.pendingFormat = updatedFormat;
         } else {
           track.trackOutput.format(updatedFormat);
@@ -1384,7 +1383,7 @@ private static final class Mp4Track {
      * A {@link Format} that needs to be passed to {@link #trackOutput}, after being possibly
      * modified based on sample data, before {@link TrackOutput#sampleMetadata} is called.
      */
-    @Nullable public Format pendingFormat;
+    @Nullable private Format pendingFormat;
 
     public Mp4Track(Track track, TrackSampleTable sampleTable, TrackOutput trackOutput) {
       this.track = track;