From f8505204ccc08d6bb394c940a9799d1039fb32f1 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Thu, 11 Feb 2021 12:59:10 +0000 Subject: [PATCH] Move MediaFormatUtil into common Also move out of the mediacodec package into the util package. PiperOrigin-RevId: 356949401 --- .../com/google/android/exoplayer2/util}/MediaFormatUtil.java | 2 +- .../google/android/exoplayer2/util}/MediaFormatUtilTest.java | 4 +--- .../android/exoplayer2/audio/MediaCodecAudioRenderer.java | 2 +- .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 2 +- .../google/android/exoplayer2/transformer/FrameworkMuxer.java | 2 +- .../exoplayer2/transformer/MediaCodecAdapterWrapper.java | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) rename library/{core/src/main/java/com/google/android/exoplayer2/mediacodec => common/src/main/java/com/google/android/exoplayer2/util}/MediaFormatUtil.java (99%) rename library/{core/src/test/java/com/google/android/exoplayer2/mediacodec => common/src/test/java/com/google/android/exoplayer2/util}/MediaFormatUtilTest.java (98%) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java index 4038025a40..653a1e3a99 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtil.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/util/MediaFormatUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.mediacodec; +package com.google.android.exoplayer2.util; import android.annotation.SuppressLint; import android.media.AudioFormat; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/MediaFormatUtilTest.java similarity index 98% rename from library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/MediaFormatUtilTest.java index b0249ab710..0d41e21496 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/mediacodec/MediaFormatUtilTest.java +++ b/library/common/src/test/java/com/google/android/exoplayer2/util/MediaFormatUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.mediacodec; +package com.google.android.exoplayer2.util; import static com.google.common.truth.Truth.assertThat; @@ -21,8 +21,6 @@ import android.media.MediaFormat; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.video.ColorInfo; import com.google.common.collect.ImmutableList; import org.junit.Test; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 5786af503d..1704249c9c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -49,8 +49,8 @@ import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer; import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer2.mediacodec.MediaFormatUtil; import com.google.android.exoplayer2.util.MediaClock; +import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; import java.nio.ByteBuffer; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java index 5908c6ff8f..7129b817b9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java @@ -58,9 +58,9 @@ import com.google.android.exoplayer2.mediacodec.MediaCodecRenderer; import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil; import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer2.mediacodec.MediaFormatUtil; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; +import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.Util; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java index 5452af4296..737e1285f5 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FrameworkMuxer.java @@ -27,7 +27,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.mediacodec.MediaFormatUtil; +import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MediaCodecAdapterWrapper.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MediaCodecAdapterWrapper.java index bf8f7f3aae..29df04d33f 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MediaCodecAdapterWrapper.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/MediaCodecAdapterWrapper.java @@ -27,8 +27,8 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.mediacodec.MediaCodecAdapter; -import com.google.android.exoplayer2.mediacodec.MediaFormatUtil; import com.google.android.exoplayer2.mediacodec.SynchronousMediaCodecAdapter; +import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.common.collect.ImmutableList; import java.io.IOException;