From dd23cb13da5f454c9de0523b57ae89212382dee8 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 18 Oct 2021 16:20:00 +0100 Subject: [PATCH] Fix moving of DataReader PiperOrigin-RevId: 403965543 --- .../google/android/exoplayer2/upstream}/DataReader.java | 3 ++- .../com/google/android/exoplayer2/upstream/DataSource.java | 1 - .../android/exoplayer2/source/BundledExtractorsAdapter.java | 2 +- .../android/exoplayer2/source/MediaParserExtractorAdapter.java | 2 +- .../android/exoplayer2/source/ProgressiveMediaExtractor.java | 2 +- .../com/google/android/exoplayer2/source/SampleDataQueue.java | 2 +- .../java/com/google/android/exoplayer2/source/SampleQueue.java | 2 +- .../android/exoplayer2/source/chunk/BundledChunkExtractor.java | 2 +- .../exoplayer2/source/mediaparser/InputReaderAdapterV30.java | 2 +- .../source/mediaparser/OutputConsumerAdapterV30.java | 2 +- .../android/exoplayer2/source/dash/PlayerEmsgHandler.java | 2 +- .../android/exoplayer2/extractor/DefaultExtractorInput.java | 2 +- .../google/android/exoplayer2/extractor/DummyTrackOutput.java | 2 +- .../google/android/exoplayer2/extractor/ExtractorInput.java | 2 +- .../com/google/android/exoplayer2/extractor/TrackOutput.java | 2 +- .../android/exoplayer2/source/hls/HlsSampleStreamWrapper.java | 2 +- .../google/android/exoplayer2/testutil/FakeTrackOutput.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename library/common/src/main/java/{androidx/media3/common => com/google/android/exoplayer2/upstream}/DataReader.java (95%) diff --git a/library/common/src/main/java/androidx/media3/common/DataReader.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataReader.java similarity index 95% rename from library/common/src/main/java/androidx/media3/common/DataReader.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DataReader.java index f26d6436cc..4b96a3ddfb 100644 --- a/library/common/src/main/java/androidx/media3/common/DataReader.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataReader.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.common; +package com.google.android.exoplayer2.upstream; +import com.google.android.exoplayer2.C; import java.io.IOException; /** Reads bytes from a data stream. */ diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java index 44aa9f15f4..c6ac0a261a 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.upstream; import android.net.Uri; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import java.io.IOException; import java.util.Collections; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/BundledExtractorsAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/source/BundledExtractorsAdapter.java index cc2b87eb10..edb16e53d6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/BundledExtractorsAdapter.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/BundledExtractorsAdapter.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source; import android.net.Uri; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.DefaultExtractorInput; import com.google.android.exoplayer2.extractor.Extractor; @@ -26,6 +25,7 @@ import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; import java.io.EOFException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaParserExtractorAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaParserExtractorAdapter.java index c9adc29977..10fd2cdeba 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/MediaParserExtractorAdapter.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaParserExtractorAdapter.java @@ -25,13 +25,13 @@ import android.media.MediaParser.SeekPoint; import android.net.Uri; import android.util.Pair; import androidx.annotation.RequiresApi; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.source.mediaparser.InputReaderAdapterV30; import com.google.android.exoplayer2.source.mediaparser.OutputConsumerAdapterV30; +import com.google.android.exoplayer2.upstream.DataReader; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaExtractor.java index fd2f0e16fa..ed4f6ac604 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaExtractor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaExtractor.java @@ -16,11 +16,11 @@ package com.google.android.exoplayer2.source; import android.net.Uri; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.PositionHolder; +import com.google.android.exoplayer2.upstream.DataReader; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java index 3d6e1d4bf2..cbc8358a2f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleDataQueue.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source; import static java.lang.Math.min; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.decoder.CryptoInfo; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; @@ -27,6 +26,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput.CryptoData; import com.google.android.exoplayer2.source.SampleQueue.SampleExtrasHolder; import com.google.android.exoplayer2.upstream.Allocation; import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; import java.io.EOFException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java index a9a67de013..4207fcfbae 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java @@ -27,7 +27,6 @@ import androidx.annotation.CallSuper; import androidx.annotation.GuardedBy; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -41,6 +40,7 @@ import com.google.android.exoplayer2.drm.DrmSessionManager.DrmSessionReference; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.source.SampleStream.ReadFlags; import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.MimeTypes; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BundledChunkExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BundledChunkExtractor.java index 84f3ad7c91..e2e3ae0914 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BundledChunkExtractor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BundledChunkExtractor.java @@ -19,7 +19,6 @@ import static com.google.android.exoplayer2.util.Util.castNonNull; import android.util.SparseArray; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.ChunkIndex; @@ -33,6 +32,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; import com.google.android.exoplayer2.extractor.rawcc.RawCcExtractor; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/InputReaderAdapterV30.java b/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/InputReaderAdapterV30.java index 7273767164..3a55645e96 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/InputReaderAdapterV30.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/InputReaderAdapterV30.java @@ -19,8 +19,8 @@ import android.annotation.SuppressLint; import android.media.MediaParser; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/OutputConsumerAdapterV30.java b/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/OutputConsumerAdapterV30.java index 9c1de5b919..233eded306 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/OutputConsumerAdapterV30.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/mediaparser/OutputConsumerAdapterV30.java @@ -40,7 +40,6 @@ import android.media.MediaParser.TrackData; import android.util.Pair; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C.SelectionFlags; import com.google.android.exoplayer2.Format; @@ -53,6 +52,7 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.SeekPoint; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput.CryptoData; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.MimeTypes; diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java index a69a16d830..f368bdc071 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/PlayerEmsgHandler.java @@ -20,7 +20,6 @@ import static com.google.android.exoplayer2.util.Util.parseXsDateTime; import android.os.Handler; import android.os.Message; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -34,6 +33,7 @@ import com.google.android.exoplayer2.source.SampleQueue; import com.google.android.exoplayer2.source.chunk.Chunk; import com.google.android.exoplayer2.source.dash.manifest.DashManifest; import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java index 3e2f4443cc..b54131ce55 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java @@ -17,9 +17,9 @@ package com.google.android.exoplayer2.extractor; import static java.lang.Math.min; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; import java.io.EOFException; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java index 852344cccd..94c4a9af94 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java @@ -18,9 +18,9 @@ package com.google.android.exoplayer2.extractor; import static java.lang.Math.min; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.EOFException; import java.io.IOException; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java index 825ba32ce3..3dc9e0b15b 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java @@ -15,8 +15,8 @@ */ package com.google.android.exoplayer2.extractor; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataReader; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java index 0136af5cd5..1a58d232f0 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java @@ -17,9 +17,9 @@ package com.google.android.exoplayer2.extractor; import androidx.annotation.IntDef; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.EOFException; import java.io.IOException; diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java index f830258624..ca72c5516d 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java @@ -26,7 +26,6 @@ import android.os.Handler; import android.os.Looper; import android.util.SparseIntArray; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -59,6 +58,7 @@ import com.google.android.exoplayer2.source.chunk.Chunk; import com.google.android.exoplayer2.source.chunk.MediaChunkIterator; import com.google.android.exoplayer2.trackselection.ExoTrackSelection; import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy; import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy.LoadErrorInfo; diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java index 0d16fa5005..7d31eb82a3 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java @@ -18,11 +18,11 @@ package com.google.android.exoplayer2.testutil; import static com.google.common.truth.Truth.assertThat; import androidx.annotation.Nullable; -import androidx.media3.common.DataReader; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.testutil.Dumper.Dumpable; +import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util;