Move format util classes to extractor package

PiperOrigin-RevId: 390577072

library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java

@@ -19,8 +19,6 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.audio.AacUtil;
-import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.common.base.Ascii;
 import com.google.common.base.Ascii;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
@@ -120,6 +118,14 @@ public final class MimeTypes {
 
 
   public static final String IMAGE_JPEG = BASE_TYPE_IMAGE + "/jpeg";
   public static final String IMAGE_JPEG = BASE_TYPE_IMAGE + "/jpeg";
 
 
+  /**
+   * A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation
+   * between regular E-AC3 ("ec-3") and E-AC3-JOC ("ec+3") streams from the codec string alone. The
+   * standard is to use "ec-3" for both, as per the <a href="https://mp4ra.org/#/codecs">MP4RA
+   * registered codec types</a>.
+   */
+  public static final String CODEC_E_AC3_JOC = "ec+3";
+
   private static final ArrayList<CustomMimeType> customMimeTypes = new ArrayList<>();
   private static final ArrayList<CustomMimeType> customMimeTypes = new ArrayList<>();
 
 
   private static final Pattern MP4A_RFC_6381_CODEC_PATTERN =
   private static final Pattern MP4A_RFC_6381_CODEC_PATTERN =
@@ -214,8 +220,7 @@ public final class MimeTypes {
         if (objectType == null) {
         if (objectType == null) {
           return false;
           return false;
         }
         }
-        @C.Encoding
-        int encoding = AacUtil.getEncodingForAudioObjectType(objectType.audioObjectTypeIndication);
+        @C.Encoding int encoding = objectType.getEncoding();
         // xHE-AAC is an exception in which it's not true that all samples will be sync samples.
         // xHE-AAC is an exception in which it's not true that all samples will be sync samples.
         // Also return false for ENCODING_INVALID, which indicates we weren't able to parse the
         // Also return false for ENCODING_INVALID, which indicates we weren't able to parse the
         // encoding from the codec string.
         // encoding from the codec string.
@@ -377,7 +382,7 @@ public final class MimeTypes {
       return MimeTypes.AUDIO_AC3;
       return MimeTypes.AUDIO_AC3;
     } else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
     } else if (codec.startsWith("ec-3") || codec.startsWith("dec3")) {
       return MimeTypes.AUDIO_E_AC3;
       return MimeTypes.AUDIO_E_AC3;
-    } else if (codec.startsWith(Ac3Util.E_AC3_JOC_CODEC_STRING)) {
+    } else if (codec.startsWith(CODEC_E_AC3_JOC)) {
       return MimeTypes.AUDIO_E_AC3_JOC;
       return MimeTypes.AUDIO_E_AC3_JOC;
     } else if (codec.startsWith("ac-4") || codec.startsWith("dac4")) {
     } else if (codec.startsWith("ac-4") || codec.startsWith("dac4")) {
       return MimeTypes.AUDIO_AC4;
       return MimeTypes.AUDIO_AC4;
@@ -514,7 +519,7 @@ public final class MimeTypes {
         if (objectType == null) {
         if (objectType == null) {
           return C.ENCODING_INVALID;
           return C.ENCODING_INVALID;
         }
         }
-        return AacUtil.getEncodingForAudioObjectType(objectType.audioObjectTypeIndication);
+        return objectType.getEncoding();
       case MimeTypes.AUDIO_AC3:
       case MimeTypes.AUDIO_AC3:
         return C.ENCODING_AC3;
         return C.ENCODING_AC3;
       case MimeTypes.AUDIO_E_AC3:
       case MimeTypes.AUDIO_E_AC3:
@@ -665,12 +670,34 @@ public final class MimeTypes {
     /** The Object Type Indication of the MP4A codec. */
     /** The Object Type Indication of the MP4A codec. */
     public final int objectTypeIndication;
     public final int objectTypeIndication;
     /** The Audio Object Type Indication of the MP4A codec, or 0 if it is absent. */
     /** The Audio Object Type Indication of the MP4A codec, or 0 if it is absent. */
-    @AacUtil.AacAudioObjectType public final int audioObjectTypeIndication;
+    public final int audioObjectTypeIndication;
 
 
     public Mp4aObjectType(int objectTypeIndication, int audioObjectTypeIndication) {
     public Mp4aObjectType(int objectTypeIndication, int audioObjectTypeIndication) {
       this.objectTypeIndication = objectTypeIndication;
       this.objectTypeIndication = objectTypeIndication;
       this.audioObjectTypeIndication = audioObjectTypeIndication;
       this.audioObjectTypeIndication = audioObjectTypeIndication;
     }
     }
+
+    /** Returns the encoding for {@link #audioObjectTypeIndication}. */
+    @C.Encoding
+    public int getEncoding() {
+      // See AUDIO_OBJECT_TYPE_AAC_* constants in AacUtil.
+      switch (audioObjectTypeIndication) {
+        case 2:
+          return C.ENCODING_AAC_LC;
+        case 5:
+          return C.ENCODING_AAC_HE_V1;
+        case 29:
+          return C.ENCODING_AAC_HE_V2;
+        case 42:
+          return C.ENCODING_AAC_XHE;
+        case 23:
+          return C.ENCODING_AAC_ELD;
+        case 22:
+          return C.ENCODING_AAC_ER_BSAC;
+        default:
+          return C.ENCODING_INVALID;
+      }
+    }
   }
   }
 
 
   private static final class CustomMimeType {
   private static final class CustomMimeType {

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java

@@ -24,7 +24,6 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.ParserException;
-import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
@@ -776,7 +775,7 @@ public class DashManifestParser extends DefaultHandler
     if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
     if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType)) {
       sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
       sampleMimeType = parseEac3SupplementalProperties(supplementalProperties);
       if (MimeTypes.AUDIO_E_AC3_JOC.equals(sampleMimeType)) {
       if (MimeTypes.AUDIO_E_AC3_JOC.equals(sampleMimeType)) {
-        codecs = Ac3Util.E_AC3_JOC_CODEC_STRING;
+        codecs = MimeTypes.CODEC_E_AC3_JOC;
       }
       }
     }
     }
     @C.SelectionFlags int selectionFlags = parseSelectionFlagsFromRoleDescriptors(roleDescriptors);
     @C.SelectionFlags int selectionFlags = parseSelectionFlagsFromRoleDescriptors(roleDescriptors);

library/common/src/main/java/com/google/android/exoplayer2/audio/AacUtil.java → library/extractor/src/main/java/com/google/android/exoplayer2/audio/AacUtil.java

@@ -300,27 +300,6 @@ public final class AacUtil {
     return specificConfig;
     return specificConfig;
   }
   }
 
 
-  /** Returns the encoding for a given AAC audio object type. */
-  @C.Encoding
-  public static int getEncodingForAudioObjectType(@AacAudioObjectType int audioObjectType) {
-    switch (audioObjectType) {
-      case AUDIO_OBJECT_TYPE_AAC_LC:
-        return C.ENCODING_AAC_LC;
-      case AUDIO_OBJECT_TYPE_AAC_SBR:
-        return C.ENCODING_AAC_HE_V1;
-      case AUDIO_OBJECT_TYPE_AAC_PS:
-        return C.ENCODING_AAC_HE_V2;
-      case AUDIO_OBJECT_TYPE_AAC_XHE:
-        return C.ENCODING_AAC_XHE;
-      case AUDIO_OBJECT_TYPE_AAC_ELD:
-        return C.ENCODING_AAC_ELD;
-      case AUDIO_OBJECT_TYPE_AAC_ER_BSAC:
-        return C.ENCODING_AAC_ER_BSAC;
-      default:
-        return C.ENCODING_INVALID;
-    }
-  }
-
   /**
   /**
    * Returns the AAC audio object type as specified in 14496-3 (2005) Table 1.14.
    * Returns the AAC audio object type as specified in 14496-3 (2005) Table 1.14.
    *
    *

library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java → library/extractor/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java

@@ -91,13 +91,6 @@ public final class Ac3Util {
     }
     }
   }
   }
 
 
-  /**
-   * A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation
-   * between regular E-AC3 ("ec-3") and E-AC3-JOC ("ec+3") streams from the codec string alone. The
-   * standard is to use "ec-3" for both, as per the <a href="https://mp4ra.org/#/codecs">MP4RA
-   * registered codec types</a>.
-   */
-  public static final String E_AC3_JOC_CODEC_STRING = "ec+3";
   /** Maximum rate for an AC-3 audio stream, in bytes per second. */
   /** Maximum rate for an AC-3 audio stream, in bytes per second. */
   public static final int AC3_MAX_RATE_BYTES_PER_SECOND = 640 * 1000 / 8;
   public static final int AC3_MAX_RATE_BYTES_PER_SECOND = 640 * 1000 / 8;
   /** Maximum rate for an E-AC-3 audio stream, in bytes per second. */
   /** Maximum rate for an E-AC-3 audio stream, in bytes per second. */

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

@@ -26,7 +26,6 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.ParserException;
-import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
@@ -518,7 +517,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
             formatBuilder.setChannelCount(channelCount);
             formatBuilder.setChannelCount(channelCount);
             if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType) && channelsString.endsWith("/JOC")) {
             if (MimeTypes.AUDIO_E_AC3.equals(sampleMimeType) && channelsString.endsWith("/JOC")) {
               sampleMimeType = MimeTypes.AUDIO_E_AC3_JOC;
               sampleMimeType = MimeTypes.AUDIO_E_AC3_JOC;
-              formatBuilder.setCodecs(Ac3Util.E_AC3_JOC_CODEC_STRING);
+              formatBuilder.setCodecs(MimeTypes.CODEC_E_AC3_JOC);
             }
             }
           }
           }
           formatBuilder.setSampleMimeType(sampleMimeType);
           formatBuilder.setSampleMimeType(sampleMimeType);