Skip to content

SDK / exoplayer

Go to a project
Commit 74c6ca1a by sheenachhabra Committed by Tofunmi Adigun-Hameed
Options

Map lib-muxer and lib-container from androidx to exoplayer2 

PiperOrigin-RevId: 532458665
(cherry picked from commit 18bbc9404810d47094a8c0e4f5fb6e9a9ca265f3)
parent 2b1e04ec
Inline Side-by-side
Showing with 43 additions and 43 deletions
library/container/src/androidTest/AndroidManifest.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="androidx.media3.container"> package="com.google.android.exoplayer2.container">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
android:usesCleartextTraffic="true"/> android:usesCleartextTraffic="true"/>
<instrumentation <instrumentation
android:targetPackage="androidx.media3.container" android:targetPackage="com.google.android.exoplayer2.container"
android:name="androidx.test.runner.AndroidJUnitRunner"/> android:name="androidx.test.runner.AndroidJUnitRunner"/>
</manifest> </manifest>
library/container/src/main/AndroidManifest.xml
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<manifest package="androidx.media3.container"> <manifest package="com.google.android.exoplayer2.container">
<uses-sdk /> <uses-sdk />
</manifest> </manifest>
library/container/src/main/java/androidx/media3/container/package-info.java → library/container/src/main/java/com/google/android/exoplayer2/container/package-info.java
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
@NonNullApi @NonNullApi
package androidx.media3.container; package com.google.android.exoplayer2.container;
import com.google.android.exoplayer2.util.NonNullApi; import com.google.android.exoplayer2.util.NonNullApi;
library/container/src/test/AndroidManifest.xml
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<manifest package="androidx.media3.container.test"> <manifest package="com.google.android.exoplayer2.container.test">
<uses-sdk/> <uses-sdk/>
</manifest> </manifest>
library/muxer/src/androidTest/AndroidManifest.xml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="androidx.media3.muxer"> package="com.google.android.exoplayer2.muxer">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
android:usesCleartextTraffic="true"/> android:usesCleartextTraffic="true"/>
<instrumentation <instrumentation
android:targetPackage="androidx.media3.muxer" android:targetPackage="com.google.android.exoplayer2.muxer"
android:name="androidx.test.runner.AndroidJUnitRunner"/> android:name="androidx.test.runner.AndroidJUnitRunner"/>
</manifest> </manifest>
library/muxer/src/androidTest/java/androidx/media3/muxer/AndroidMuxerTestUtil.java → library/muxer/src/androidTest/java/com/google/android/exoplayer2/muxer/AndroidMuxerTestUtil.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
/** Utilities for muxer test cases. */ /** Utilities for muxer test cases. */
/* package */ final class AndroidMuxerTestUtil { /* package */ final class AndroidMuxerTestUtil {
......
library/muxer/src/androidTest/java/androidx/media3/muxer/Mp4MuxerEndToEndTest.java → library/muxer/src/androidTest/java/com/google/android/exoplayer2/muxer/Mp4MuxerEndToEndTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import android.content.Context; import android.content.Context;
import android.media.MediaCodec; import android.media.MediaCodec;
......
library/muxer/src/main/AndroidManifest.xml
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<manifest package="androidx.media3.muxer"> <manifest package="com.google.android.exoplayer2.muxer">
<uses-sdk /> <uses-sdk />
</manifest> </manifest>
library/muxer/src/main/java/androidx/media3/muxer/AnnexBToAvccConverter.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/AnnexBToAvccConverter.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.android.exoplayer2.util.Assertions.checkArgument; import static com.google.android.exoplayer2.util.Assertions.checkArgument;
......
library/muxer/src/main/java/androidx/media3/muxer/AnnexBUtils.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/AnnexBUtils.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
......
library/muxer/src/main/java/androidx/media3/muxer/BoxUtils.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/BoxUtils.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
......
library/muxer/src/main/java/androidx/media3/muxer/Boxes.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Boxes.java
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static androidx.media3.muxer.ColorUtils.MEDIAFORMAT_STANDARD_TO_PRIMARIES_AND_MATRIX; import static com.google.android.exoplayer2.muxer.ColorUtils.MEDIAFORMAT_STANDARD_TO_PRIMARIES_AND_MATRIX;
import static androidx.media3.muxer.ColorUtils.MEDIAFORMAT_TRANSFER_TO_MP4_TRANSFER; import static com.google.android.exoplayer2.muxer.ColorUtils.MEDIAFORMAT_TRANSFER_TO_MP4_TRANSFER;
import static androidx.media3.muxer.Mp4Utils.MVHD_TIMEBASE; import static com.google.android.exoplayer2.muxer.Mp4Utils.MVHD_TIMEBASE;
import static com.google.android.exoplayer2.util.Assertions.checkArgument; import static com.google.android.exoplayer2.util.Assertions.checkArgument;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
......
library/muxer/src/main/java/androidx/media3/muxer/ColorUtils.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/ColorUtils.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import android.media.MediaFormat; import android.media.MediaFormat;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
......
library/muxer/src/main/java/androidx/media3/muxer/MetadataCollector.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/MetadataCollector.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
......
library/muxer/src/main/java/androidx/media3/muxer/Mp4Location.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Mp4Location.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
/** Stores location data. */ /** Stores location data. */
/* package */ final class Mp4Location { /* package */ final class Mp4Location {
......
library/muxer/src/main/java/androidx/media3/muxer/Mp4MoovStructure.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Mp4MoovStructure.java
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static androidx.media3.muxer.Mp4Utils.MVHD_TIMEBASE; import static com.google.android.exoplayer2.muxer.Mp4Utils.MVHD_TIMEBASE;
import static java.lang.Math.max; import static java.lang.Math.max;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
......
library/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Mp4Muxer.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static java.lang.annotation.ElementType.TYPE_USE; import static java.lang.annotation.ElementType.TYPE_USE;
......
library/muxer/src/main/java/androidx/media3/muxer/Mp4Utils.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Mp4Utils.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
/** Utilities for MP4 files. */ /** Utilities for MP4 files. */
/* package */ final class Mp4Utils { /* package */ final class Mp4Utils {
......
library/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/Mp4Writer.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
...@@ -22,8 +22,8 @@ import static java.lang.Math.max; ...@@ -22,8 +22,8 @@ import static java.lang.Math.max;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
import android.util.Pair; import android.util.Pair;
import androidx.media3.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
......
library/muxer/src/main/java/androidx/media3/muxer/package-info.java → library/muxer/src/main/java/com/google/android/exoplayer2/muxer/package-info.java
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
@NonNullApi @NonNullApi
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import com.google.android.exoplayer2.util.NonNullApi; import com.google.android.exoplayer2.util.NonNullApi;
library/muxer/src/test/AndroidManifest.xml
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
limitations under the License. limitations under the License.
--> -->
<manifest package="androidx.media3.muxer.test"> <manifest package="com.google.android.exoplayer2.muxer.test">
<uses-sdk/> <uses-sdk/>
</manifest> </manifest>
library/muxer/src/test/java/androidx/media3/muxer/AnnexBUtilsTest.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/AnnexBUtilsTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.android.exoplayer2.util.Util.getBytesFromHexString; import static com.google.android.exoplayer2.util.Util.getBytesFromHexString;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
......
library/muxer/src/test/java/androidx/media3/muxer/BoxesTest.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/BoxesTest.java
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static androidx.media3.muxer.Mp4Muxer.LAST_FRAME_DURATION_BEHAVIOR_DUPLICATE_PREV_DURATION; import static com.google.android.exoplayer2.muxer.Mp4Muxer.LAST_FRAME_DURATION_BEHAVIOR_DUPLICATE_PREV_DURATION;
import static androidx.media3.muxer.Mp4Muxer.LAST_FRAME_DURATION_BEHAVIOR_INSERT_SHORT_FRAME; import static com.google.android.exoplayer2.muxer.Mp4Muxer.LAST_FRAME_DURATION_BEHAVIOR_INSERT_SHORT_FRAME;
import static androidx.media3.muxer.MuxerTestUtil.getExpectedDumpFilePath; import static com.google.android.exoplayer2.muxer.MuxerTestUtil.getExpectedDumpFilePath;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertThrows;
......
library/muxer/src/test/java/androidx/media3/muxer/DefaultAnnexBToAvccConverterTest.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/DefaultAnnexBToAvccConverterTest.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
......
library/muxer/src/test/java/androidx/media3/muxer/Mp4MuxerEndToEndTest.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/Mp4MuxerEndToEndTest.java
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context; import android.content.Context;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
import android.util.Pair; import android.util.Pair;
import androidx.media3.muxer.Mp4Muxer.TrackToken;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor; import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
import com.google.android.exoplayer2.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.testutil.DumpFileAsserts; import com.google.android.exoplayer2.testutil.DumpFileAsserts;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
......
library/muxer/src/test/java/androidx/media3/muxer/Mp4MuxerMetadataTest.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/Mp4MuxerMetadataTest.java
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import android.content.Context; import android.content.Context;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
import android.util.Pair; import android.util.Pair;
import androidx.media3.muxer.Mp4Muxer.TrackToken;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor; import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
import com.google.android.exoplayer2.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.testutil.DumpFileAsserts; import com.google.android.exoplayer2.testutil.DumpFileAsserts;
import com.google.android.exoplayer2.testutil.DumpableMp4Box; import com.google.android.exoplayer2.testutil.DumpableMp4Box;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
......
library/muxer/src/test/java/androidx/media3/muxer/MuxerTestUtil.java → library/muxer/src/test/java/com/google/android/exoplayer2/muxer/MuxerTestUtil.java
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package androidx.media3.muxer; package com.google.android.exoplayer2.muxer;
import android.media.MediaCodec; import android.media.MediaCodec;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/InAppMuxer.java
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
*/ */
package com.google.android.exoplayer2.transformer; package com.google.android.exoplayer2.transformer;
import static androidx.media3.muxer.Mp4Muxer.SUPPORTED_AUDIO_SAMPLE_MIME_TYPES; import static com.google.android.exoplayer2.muxer.Mp4Muxer.SUPPORTED_AUDIO_SAMPLE_MIME_TYPES;
import static androidx.media3.muxer.Mp4Muxer.SUPPORTED_VIDEO_SAMPLE_MIME_TYPES; import static com.google.android.exoplayer2.muxer.Mp4Muxer.SUPPORTED_VIDEO_SAMPLE_MIME_TYPES;
import android.media.MediaCodec.BufferInfo; import android.media.MediaCodec.BufferInfo;
import androidx.media3.muxer.Mp4Muxer;
import androidx.media3.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.mp4.Mp4LocationData; import com.google.android.exoplayer2.metadata.mp4.Mp4LocationData;
import com.google.android.exoplayer2.muxer.Mp4Muxer;
import com.google.android.exoplayer2.muxer.Mp4Muxer.TrackToken;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment