Fix moving of DataReader

PiperOrigin-RevId: 403965543

library/common/src/main/java/androidx/media3/common/DataReader.java → 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. */

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;