Move NAL unit related methods from common to container module

PiperOrigin-RevId: 532750099
(cherry picked from commit e0d6f67dd90acbe8f1c41ffd9550d18eea2ca129)

libraries/container/build.gradle

@@ -40,6 +40,11 @@ ext {
 
 dependencies {
     implementation project(modulePrefix + 'lib-common')
+    implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
+    testImplementation 'com.google.truth:truth:' + truthVersion
+    testImplementation 'junit:junit:' + junitVersion
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
 apply from: '../../javadoc_library.gradle'
 

libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common.util;
+package androidx.media3.container;
 
 import static java.lang.Math.min;
 
@@ -22,6 +22,9 @@ import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
+import androidx.media3.common.util.Assertions;
+import androidx.media3.common.util.Log;
+import androidx.media3.common.util.UnstableApi;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 

libraries/container/src/main/java/androidx/media3/container/ParsableNalUnitBitArray.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common.util;
+package androidx.media3.container;
+
+import androidx.media3.common.util.Assertions;
+import androidx.media3.common.util.UnstableApi;
 
 /**
  * Wraps a byte array, providing methods that allow it to be read as a NAL unit bitstream.

libraries/container/src/test/java/androidx/media3/container/NalUnitUtilTest.java

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common.util;
+package androidx.media3.container;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import androidx.media3.common.util.Assertions;
+import androidx.media3.common.util.Util;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.nio.ByteBuffer;
 import java.util.Arrays;

libraries/container/src/test/java/androidx/media3/container/ParsableNalUnitBitArrayTest.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.common.util;
+package androidx.media3.container;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
+import androidx.media3.common.util.Assertions;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;

libraries/exoplayer/build.gradle

@@ -35,6 +35,7 @@ android {
 
 dependencies {
     api project(modulePrefix + 'lib-common')
+    api project(modulePrefix + 'lib-container')
     // TODO(b/203754886): Revisit which modules are exported as API dependencies.
     api project(modulePrefix + 'lib-datasource')
     api project(modulePrefix + 'lib-decoder')

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java

@@ -53,11 +53,11 @@ import androidx.media3.common.MimeTypes;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.Log;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.TimedValueQueue;
 import androidx.media3.common.util.TraceUtil;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.decoder.CryptoConfig;
 import androidx.media3.decoder.DecoderInputBuffer;
 import androidx.media3.decoder.DecoderInputBuffer.InsufficientCapacityException;

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java

@@ -17,8 +17,8 @@ package androidx.media3.exoplayer.rtsp;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkNotNull;
-import static androidx.media3.common.util.NalUnitUtil.NAL_START_CODE;
 import static androidx.media3.common.util.Util.castNonNull;
+import static androidx.media3.container.NalUnitUtil.NAL_START_CODE;
 import static androidx.media3.exoplayer.rtsp.MediaDescription.MEDIA_TYPE_AUDIO;
 import static androidx.media3.exoplayer.rtsp.RtpPayloadFormat.getMimeTypeFromRtpMediaType;
 import static androidx.media3.exoplayer.rtsp.SessionDescription.ATTR_CONTROL;
@@ -33,10 +33,10 @@ import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.CodecSpecificDataUtil;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableBitArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.AacUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java

@@ -23,9 +23,9 @@ import static androidx.media3.exoplayer.rtsp.reader.RtpReaderUtils.toSampleTimeU
 import androidx.media3.common.C;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.exoplayer.rtsp.RtpPacket;
 import androidx.media3.exoplayer.rtsp.RtpPayloadFormat;
 import androidx.media3.extractor.ExtractorOutput;

libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH265Reader.java

@@ -22,9 +22,9 @@ import static androidx.media3.exoplayer.rtsp.reader.RtpReaderUtils.toSampleTimeU
 import androidx.media3.common.C;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.exoplayer.rtsp.RtpPacket;
 import androidx.media3.exoplayer.rtsp.RtpPayloadFormat;
 import androidx.media3.extractor.ExtractorOutput;

libraries/extractor/build.gradle

@@ -26,6 +26,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'lib-common')
+    implementation project(modulePrefix + 'lib-container')
     // TODO(b/203752187): Remove this dependency.
     implementation project(modulePrefix + 'lib-decoder')
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion

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

@@ -20,10 +20,10 @@ import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.CodecSpecificDataUtil;
-import androidx.media3.common.util.NalUnitUtil;
-import androidx.media3.common.util.NalUnitUtil.SpsData;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.container.NalUnitUtil;
+import androidx.media3.container.NalUnitUtil.SpsData;
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -20,9 +20,9 @@ import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.CodecSpecificDataUtil;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.container.NalUnitUtil;
 import java.util.Collections;
 import java.util.List;
 

libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java

@@ -19,8 +19,8 @@ import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.AvcConfig;
 import androidx.media3.extractor.TrackOutput;
 

libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java

@@ -37,10 +37,10 @@ import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
 import androidx.media3.common.util.LongArray;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.AacUtil;
 import androidx.media3.extractor.AvcConfig;
 import androidx.media3.extractor.ChunkIndex;

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

@@ -34,11 +34,11 @@ import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.TimestampAdjuster;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.Ac4Util;
 import androidx.media3.extractor.CeaUtil;
 import androidx.media3.extractor.ChunkIndex;

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

@@ -31,9 +31,9 @@ import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.Ac3Util;
 import androidx.media3.extractor.Ac4Util;
 import androidx.media3.extractor.Extractor;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java

@@ -23,10 +23,10 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.ExtractorOutput;
 import androidx.media3.extractor.TrackOutput;
 import androidx.media3.extractor.ts.TsPayloadReader.TrackIdGenerator;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java

@@ -26,10 +26,10 @@ import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Log;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableBitArray;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.ExtractorOutput;
 import androidx.media3.extractor.TrackOutput;
 import androidx.media3.extractor.ts.TsPayloadReader.TrackIdGenerator;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java

@@ -24,12 +24,12 @@ import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.CodecSpecificDataUtil;
-import androidx.media3.common.util.NalUnitUtil;
-import androidx.media3.common.util.NalUnitUtil.SpsData;
 import androidx.media3.common.util.ParsableByteArray;
-import androidx.media3.common.util.ParsableNalUnitBitArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
+import androidx.media3.container.NalUnitUtil.SpsData;
+import androidx.media3.container.ParsableNalUnitBitArray;
 import androidx.media3.extractor.ExtractorOutput;
 import androidx.media3.extractor.TrackOutput;
 import androidx.media3.extractor.ts.TsPayloadReader.TrackIdGenerator;

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java

@@ -21,10 +21,10 @@ import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.CodecSpecificDataUtil;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import androidx.media3.extractor.ExtractorOutput;
 import androidx.media3.extractor.TrackOutput;
 import androidx.media3.extractor.ts.TsPayloadReader.TrackIdGenerator;

libraries/muxer/build.gradle

@@ -40,6 +40,7 @@ ext {
 
 dependencies {
     implementation project(modulePrefix + 'lib-common')
+    implementation project(modulePrefix + 'lib-container')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion

libraries/muxer/src/main/java/androidx/media3/muxer/Boxes.java

@@ -28,8 +28,8 @@ import androidx.media3.common.C;
 import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
-import androidx.media3.common.util.NalUnitUtil;
 import androidx.media3.common.util.Util;
+import androidx.media3.container.NalUnitUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Bytes;

libraries/transformer/src/main/java/androidx/media3/transformer/SefSlowMotionFlattener.java

@@ -18,7 +18,7 @@ package androidx.media3.transformer;
 
 import static androidx.media3.common.util.Assertions.checkArgument;
 import static androidx.media3.common.util.Assertions.checkState;
-import static androidx.media3.common.util.NalUnitUtil.NAL_START_CODE;
+import static androidx.media3.container.NalUnitUtil.NAL_START_CODE;
 import static java.lang.Math.min;
 
 import androidx.annotation.Nullable;