From e0d6f67dd90acbe8f1c41ffd9550d18eea2ca129 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Wed, 17 May 2023 12:55:14 +0100 Subject: [PATCH] Move NAL unit related methods from common to container module PiperOrigin-RevId: 532750099 --- libraries/container/build.gradle | 5 +++++ .../main/java/androidx/media3/container}/NalUnitUtil.java | 5 ++++- .../androidx/media3/container}/ParsableNalUnitBitArray.java | 5 ++++- .../java/androidx/media3/container}/NalUnitUtilTest.java | 4 +++- .../media3/container}/ParsableNalUnitBitArrayTest.java | 3 ++- libraries/exoplayer/build.gradle | 1 + .../media3/exoplayer/mediacodec/MediaCodecRenderer.java | 2 +- .../java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java | 4 ++-- .../media3/exoplayer/rtsp/reader/RtpH264Reader.java | 2 +- .../media3/exoplayer/rtsp/reader/RtpH265Reader.java | 2 +- libraries/extractor/build.gradle | 1 + .../src/main/java/androidx/media3/extractor/AvcConfig.java | 4 ++-- .../src/main/java/androidx/media3/extractor/HevcConfig.java | 2 +- .../media3/extractor/flv/VideoTagPayloadReader.java | 2 +- .../androidx/media3/extractor/mkv/MatroskaExtractor.java | 2 +- .../media3/extractor/mp4/FragmentedMp4Extractor.java | 2 +- .../java/androidx/media3/extractor/mp4/Mp4Extractor.java | 2 +- .../main/java/androidx/media3/extractor/ts/H262Reader.java | 2 +- .../main/java/androidx/media3/extractor/ts/H263Reader.java | 2 +- .../main/java/androidx/media3/extractor/ts/H264Reader.java | 6 +++--- .../main/java/androidx/media3/extractor/ts/H265Reader.java | 2 +- libraries/muxer/build.gradle | 1 + .../muxer/src/main/java/androidx/media3/muxer/Boxes.java | 2 +- .../androidx/media3/transformer/SefSlowMotionFlattener.java | 2 +- 24 files changed, 41 insertions(+), 24 deletions(-) rename libraries/{common/src/main/java/androidx/media3/common/util => container/src/main/java/androidx/media3/container}/NalUnitUtil.java (99%) rename libraries/{common/src/main/java/androidx/media3/common/util => container/src/main/java/androidx/media3/container}/ParsableNalUnitBitArray.java (98%) rename libraries/{common/src/test/java/androidx/media3/common/util => container/src/test/java/androidx/media3/container}/NalUnitUtilTest.java (98%) rename libraries/{common/src/test/java/androidx/media3/common/util => container/src/test/java/androidx/media3/container}/ParsableNalUnitBitArrayTest.java (98%) diff --git a/libraries/container/build.gradle b/libraries/container/build.gradle index c6f77dad95..fb0b1619b9 100644 --- a/libraries/container/build.gradle +++ b/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' diff --git a/libraries/common/src/main/java/androidx/media3/common/util/NalUnitUtil.java b/libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java similarity index 99% rename from libraries/common/src/main/java/androidx/media3/common/util/NalUnitUtil.java rename to libraries/container/src/main/java/androidx/media3/container/NalUnitUtil.java index 92ae0db121..5889e8152a 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/NalUnitUtil.java +++ b/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; diff --git a/libraries/common/src/main/java/androidx/media3/common/util/ParsableNalUnitBitArray.java b/libraries/container/src/main/java/androidx/media3/container/ParsableNalUnitBitArray.java similarity index 98% rename from libraries/common/src/main/java/androidx/media3/common/util/ParsableNalUnitBitArray.java rename to libraries/container/src/main/java/androidx/media3/container/ParsableNalUnitBitArray.java index e4896020b9..79d3bf8734 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/ParsableNalUnitBitArray.java +++ b/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. diff --git a/libraries/common/src/test/java/androidx/media3/common/util/NalUnitUtilTest.java b/libraries/container/src/test/java/androidx/media3/container/NalUnitUtilTest.java similarity index 98% rename from libraries/common/src/test/java/androidx/media3/common/util/NalUnitUtilTest.java rename to libraries/container/src/test/java/androidx/media3/container/NalUnitUtilTest.java index f8f730e61b..2ab0a7c7f1 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/NalUnitUtilTest.java +++ b/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; diff --git a/libraries/common/src/test/java/androidx/media3/common/util/ParsableNalUnitBitArrayTest.java b/libraries/container/src/test/java/androidx/media3/container/ParsableNalUnitBitArrayTest.java similarity index 98% rename from libraries/common/src/test/java/androidx/media3/common/util/ParsableNalUnitBitArrayTest.java rename to libraries/container/src/test/java/androidx/media3/container/ParsableNalUnitBitArrayTest.java index f325bd1c4b..f4745fd97c 100644 --- a/libraries/common/src/test/java/androidx/media3/common/util/ParsableNalUnitBitArrayTest.java +++ b/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; diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle index b7fef71ab0..61f13db560 100644 --- a/libraries/exoplayer/build.gradle +++ b/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') diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java index 59320e1d87..8c0c136694 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java +++ b/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; diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java index d14439cc01..92d1d4b78e 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspMediaTrack.java +++ b/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; diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java index 94ed41a518..0403ecf6bc 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java +++ b/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; diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH265Reader.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH265Reader.java index f3b6d25c3e..2f77918dae 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH265Reader.java +++ b/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; diff --git a/libraries/extractor/build.gradle b/libraries/extractor/build.gradle index 6cd3a81b28..80ebd2a69f 100644 --- a/libraries/extractor/build.gradle +++ b/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 diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/AvcConfig.java b/libraries/extractor/src/main/java/androidx/media3/extractor/AvcConfig.java index e6b274cb86..0de91bb649 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/AvcConfig.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java b/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java index 421a9a1d6f..fa9674ac74 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/HevcConfig.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java index 7a9f5a767e..35fdc6f3e9 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java index 7dc3f48b82..a678e8cb82 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java index 22b9192cee..9427ba1263 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java index a12211adc1..f3082ee138 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java index 90d9c57071..11b301d1ff 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java index 92200855e0..b7964576d1 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java index c93f8a2158..528fa28a84 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java +++ b/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; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java index d7724b0632..9187bfb0a8 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java +++ b/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; diff --git a/libraries/muxer/build.gradle b/libraries/muxer/build.gradle index 7c0ce562b4..6d9ce162aa 100644 --- a/libraries/muxer/build.gradle +++ b/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 diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Boxes.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Boxes.java index ca939c880c..6c35ca9574 100644 --- a/libraries/muxer/src/main/java/androidx/media3/muxer/Boxes.java +++ b/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; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SefSlowMotionFlattener.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SefSlowMotionFlattener.java index eea3300694..5499da5c58 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SefSlowMotionFlattener.java +++ b/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;