Split AAC utils out of CodecSpecificDataUtil

PiperOrigin-RevId: 297823929

library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java

@@ -28,7 +28,6 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
@@ -1258,14 +1257,14 @@ public final class DefaultAudioSink implements AudioSink {
       case C.ENCODING_MP3:
         return MpegAudioUtil.parseMpegAudioFrameSampleCount(buffer.get(buffer.position()));
       case C.ENCODING_AAC_LC:
-        return CodecSpecificDataUtil.AAC_LC_AUDIO_SAMPLE_COUNT;
+        return AacUtil.AAC_LC_AUDIO_SAMPLE_COUNT;
       case C.ENCODING_AAC_HE_V1:
       case C.ENCODING_AAC_HE_V2:
-        return CodecSpecificDataUtil.AAC_HE_AUDIO_SAMPLE_COUNT;
+        return AacUtil.AAC_HE_AUDIO_SAMPLE_COUNT;
       case C.ENCODING_AAC_XHE:
-        return CodecSpecificDataUtil.AAC_XHE_AUDIO_SAMPLE_COUNT;
+        return AacUtil.AAC_XHE_AUDIO_SAMPLE_COUNT;
       case C.ENCODING_AAC_ELD:
-        return CodecSpecificDataUtil.AAC_LD_AUDIO_SAMPLE_COUNT;
+        return AacUtil.AAC_LD_AUDIO_SAMPLE_COUNT;
       case C.ENCODING_DTS:
       case C.ENCODING_DTS_HD:
         return DtsUtil.parseDtsAudioSampleCount(buffer);

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java

@@ -18,9 +18,8 @@ package com.google.android.exoplayer2.extractor.flv;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.AacUtil;
 import com.google.android.exoplayer2.extractor.TrackOutput;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil.AacConfig;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.util.Collections;
@@ -109,8 +108,7 @@ import java.util.Collections;
         // Parse the sequence header.
         byte[] audioSpecificConfig = new byte[data.bytesLeft()];
         data.readBytes(audioSpecificConfig, 0, audioSpecificConfig.length);
-        AacConfig aacConfig =
-            CodecSpecificDataUtil.parseAacAudioSpecificConfig(audioSpecificConfig);
+        AacUtil.Config aacConfig = AacUtil.parseAudioSpecificConfig(audioSpecificConfig);
         Format format =
             new Format.Builder()
                 .setSampleMimeType(MimeTypes.AUDIO_AAC)

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java

@@ -22,6 +22,7 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.AacUtil;
 import com.google.android.exoplayer2.audio.Ac3Util;
 import com.google.android.exoplayer2.audio.Ac4Util;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -29,7 +30,6 @@ import com.google.android.exoplayer2.extractor.GaplessInfoHolder;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil.AacConfig;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -1184,8 +1184,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           if (MimeTypes.AUDIO_AAC.equals(mimeType) && initializationData != null) {
             // Update sampleRate and channelCount from the AudioSpecificConfig initialization data,
             // which is more reliable. See [Internal: b/10903778].
-            AacConfig aacConfig =
-                CodecSpecificDataUtil.parseAacAudioSpecificConfig(initializationData);
+            AacUtil.Config aacConfig = AacUtil.parseAudioSpecificConfig(initializationData);
             sampleRate = aacConfig.sampleRateHz;
             channelCount = aacConfig.channelCount;
             codecs = aacConfig.codecs;

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

@@ -19,13 +19,12 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.AacUtil;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil.AacConfig;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
@@ -467,9 +466,9 @@ public final class AdtsReader implements ElementaryStreamReader {
       int channelConfig = adtsScratch.readBits(3);
 
       byte[] audioSpecificConfig =
-          CodecSpecificDataUtil.buildAacAudioSpecificConfig(
+          AacUtil.buildAudioSpecificConfig(
               audioObjectType, firstFrameSampleRateIndex, channelConfig);
-      AacConfig aacConfig = CodecSpecificDataUtil.parseAacAudioSpecificConfig(audioSpecificConfig);
+      AacUtil.Config aacConfig = AacUtil.parseAudioSpecificConfig(audioSpecificConfig);
       Format format =
           new Format.Builder()
               .setId(formatId)

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

@@ -19,12 +19,11 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.AacUtil;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
-import com.google.android.exoplayer2.util.CodecSpecificDataUtil.AacConfig;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -273,8 +272,7 @@ public final class LatmReader implements ElementaryStreamReader {
 
   private int parseAudioSpecificConfig(ParsableBitArray data) throws ParserException {
     int bitsLeft = data.bitsLeft();
-    AacConfig config =
-        CodecSpecificDataUtil.parseAacAudioSpecificConfig(data, /* forceReadToEnd= */ true);
+    AacUtil.Config config = AacUtil.parseAudioSpecificConfig(data, /* forceReadToEnd= */ true);
     sampleRateHz = config.sampleRateHz;
     channelCount = config.channelCount;
     return bitsLeft - data.bitsLeft();

library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java

@@ -23,6 +23,7 @@ import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.audio.AacUtil;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
@@ -687,7 +688,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
         if (codecSpecificData.isEmpty() && MimeTypes.AUDIO_AAC.equals(sampleMimeType)) {
           codecSpecificData =
               Collections.singletonList(
-                  CodecSpecificDataUtil.buildAacLcAudioSpecificConfig(sampleRate, channelCount));
+                  AacUtil.buildAacLcAudioSpecificConfig(sampleRate, channelCount));
         }
         formatBuilder
             .setContainerMimeType(MimeTypes.AUDIO_MP4)