From 55b82ff8ae491f6bcc7f3901476d2b1571a10005 Mon Sep 17 00:00:00 2001 From: rohks Date: Mon, 31 Oct 2022 15:53:41 +0000 Subject: [PATCH] Disable failing tests of FlacExtractorSeekTest PiperOrigin-RevId: 485061783 --- .../ext/ffmpeg/FfmpegAudioRenderer.java | 2 +- .../ext/flac/FlacExtractorSeekTest.java | 7 +++++++ .../ext/flac/LibflacAudioRenderer.java | 2 +- .../ext/opus/LibopusAudioRenderer.java | 2 +- .../exoplayer2}/audio/AudioProcessor.java | 2 +- .../audio/AudioProcessorChain.java | 2 +- .../exoplayer2}/audio/package-info.java | 2 +- .../exoplayer2/audio/BaseAudioProcessor.java | 1 - .../audio/ChannelMappingAudioProcessor.java | 1 - .../audio/DecoderAudioRenderer.java | 1 - .../exoplayer2/audio/DefaultAudioSink.java | 20 +++++++++---------- .../audio/FloatResamplingAudioProcessor.java | 1 - .../audio/MediaCodecAudioRenderer.java | 1 - .../audio/ResamplingAudioProcessor.java | 1 - .../audio/SilenceSkippingAudioProcessor.java | 1 - .../exoplayer2/audio/SonicAudioProcessor.java | 1 - .../exoplayer2/audio/TeeAudioProcessor.java | 1 - .../SilenceSkippingAudioProcessorTest.java | 2 +- .../audio/SonicAudioProcessorTest.java | 4 ++-- .../audio/TeeAudioProcessorTest.java | 2 +- .../audio/TrimmingAudioProcessorTest.java | 2 +- .../AudioTranscodingSamplePipeline.java | 4 ++-- .../SpeedChangingAudioProcessor.java | 2 +- .../transformer/TransformationException.java | 4 ++-- .../SpeedChangingAudioProcessorTest.java | 2 +- 25 files changed, 34 insertions(+), 36 deletions(-) rename library/common/src/main/java/{androidx/media3/common => com/google/android/exoplayer2}/audio/AudioProcessor.java (99%) rename library/common/src/main/java/{androidx/media3/common => com/google/android/exoplayer2}/audio/AudioProcessorChain.java (98%) rename library/common/src/main/java/{androidx/media3/common => com/google/android/exoplayer2}/audio/package-info.java (93%) diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java index c0056f4a002..4ff8ded2a7e 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java @@ -21,9 +21,9 @@ import android.os.Handler; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.AudioSink.SinkFormatSupport; diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java index 21a2558dd94..4460dfabf5d 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java @@ -29,6 +29,7 @@ import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.List; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,6 +76,7 @@ public void seeking_seekTable_handlesSeekToZero() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_seekTable_handlesSeekToEoF() throws IOException { String fileName = TEST_FILE_SEEK_TABLE; @@ -92,6 +94,7 @@ public void seeking_seekTable_handlesSeekToEoF() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_seekTable_handlesSeekingBackward() throws IOException { String fileName = TEST_FILE_SEEK_TABLE; @@ -111,6 +114,7 @@ public void seeking_seekTable_handlesSeekingBackward() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_seekTable_handlesSeekingForward() throws IOException { String fileName = TEST_FILE_SEEK_TABLE; @@ -158,6 +162,7 @@ public void seeking_binarySearch_handlesSeekToZero() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_binarySearch_handlesSeekToEoF() throws IOException { String fileName = TEST_FILE_BINARY_SEARCH; @@ -175,6 +180,7 @@ public void seeking_binarySearch_handlesSeekToEoF() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_binarySearch_handlesSeekingBackward() throws IOException { String fileName = TEST_FILE_BINARY_SEARCH; @@ -194,6 +200,7 @@ public void seeking_binarySearch_handlesSeekingBackward() throws IOException { fileName, trackOutput, targetSeekTimeUs, extractedFrameIndex); } + @Ignore("Fix [internal: b/249505968] before enabling this.") @Test public void seeking_binarySearch_handlesSeekingForward() throws IOException { String fileName = TEST_FILE_BINARY_SEARCH; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java index 598b380c9ab..a03c9a271bd 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java @@ -17,9 +17,9 @@ import android.os.Handler; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.DecoderAudioRenderer; diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java index 26e0af8ff28..4debad0b66a 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java @@ -17,9 +17,9 @@ import android.os.Handler; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioSink; import com.google.android.exoplayer2.audio.AudioSink.SinkFormatSupport; diff --git a/library/common/src/main/java/androidx/media3/common/audio/AudioProcessor.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java similarity index 99% rename from library/common/src/main/java/androidx/media3/common/audio/AudioProcessor.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java index 4231aaf9f38..791f9aa0500 100644 --- a/library/common/src/main/java/androidx/media3/common/audio/AudioProcessor.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.common.audio; +package com.google.android.exoplayer2.audio; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; diff --git a/library/common/src/main/java/androidx/media3/common/audio/AudioProcessorChain.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessorChain.java similarity index 98% rename from library/common/src/main/java/androidx/media3/common/audio/AudioProcessorChain.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessorChain.java index c0a49a531d8..0c28ef6d6a5 100644 --- a/library/common/src/main/java/androidx/media3/common/audio/AudioProcessorChain.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioProcessorChain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package androidx.media3.common.audio; +package com.google.android.exoplayer2.audio; import com.google.android.exoplayer2.PlaybackParameters; diff --git a/library/common/src/main/java/androidx/media3/common/audio/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java similarity index 93% rename from library/common/src/main/java/androidx/media3/common/audio/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java index 14e03120271..134e17d2a33 100644 --- a/library/common/src/main/java/androidx/media3/common/audio/package-info.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ @NonNullApi -package androidx.media3.common.audio; +package com.google.android.exoplayer2.audio; import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java index fca6b741632..b42d5f0767e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/BaseAudioProcessor.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.audio; import androidx.annotation.CallSuper; -import androidx.media3.common.audio.AudioProcessor; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java index 6e506c8f525..503f07a2c37 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.audio; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Assertions; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java index dd65e393eb0..546ca63d96a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DecoderAudioRenderer.java @@ -31,7 +31,6 @@ import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java index cf27c692dbb..6a82db48bdd 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java @@ -38,13 +38,12 @@ import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.media3.common.audio.AudioProcessor; -import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayer.AudioOffloadListener; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.analytics.PlayerId; +import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.ConditionVariable; @@ -99,10 +98,11 @@ private InvalidAudioTrackTimestampException(String message) { } /** - * @deprecated Use {@link androidx.media3.common.audio.AudioProcessorChain}. + * @deprecated Use {@link com.google.android.exoplayer2.audio.AudioProcessorChain}. */ @Deprecated - public interface AudioProcessorChain extends androidx.media3.common.audio.AudioProcessorChain {} + public interface AudioProcessorChain + extends com.google.android.exoplayer2.audio.AudioProcessorChain {} /** * The default audio processor chain, which applies a (possibly empty) chain of user-defined audio @@ -212,7 +212,7 @@ int getBufferSizeInBytes( public static final class Builder { private AudioCapabilities audioCapabilities; - @Nullable private androidx.media3.common.audio.AudioProcessorChain audioProcessorChain; + @Nullable private com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain; private boolean enableFloatOutput; private boolean enableAudioTrackPlaybackParams; private int offloadMode; @@ -253,15 +253,15 @@ public Builder setAudioProcessors(AudioProcessor[] audioProcessors) { } /** - * Sets the {@link androidx.media3.common.audio.AudioProcessorChain} to process audio before - * playback. The instance passed in must not be reused in other sinks. Processing chains are - * only supported for PCM playback (not passthrough or offload). + * Sets the {@link com.google.android.exoplayer2.audio.AudioProcessorChain} to process audio + * before playback. The instance passed in must not be reused in other sinks. Processing chains + * are only supported for PCM playback (not passthrough or offload). * *

By default, no processing will be applied. */ @CanIgnoreReturnValue public Builder setAudioProcessorChain( - androidx.media3.common.audio.AudioProcessorChain audioProcessorChain) { + com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain) { checkNotNull(audioProcessorChain); this.audioProcessorChain = audioProcessorChain; return this; @@ -451,7 +451,7 @@ public DefaultAudioSink build() { private static int pendingReleaseCount; private final AudioCapabilities audioCapabilities; - private final androidx.media3.common.audio.AudioProcessorChain audioProcessorChain; + private final com.google.android.exoplayer2.audio.AudioProcessorChain audioProcessorChain; private final boolean enableFloatOutput; private final ChannelMappingAudioProcessor channelMappingAudioProcessor; private final TrimmingAudioProcessor trimmingAudioProcessor; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java index c94533b3587..ca2a54d572b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/FloatResamplingAudioProcessor.java @@ -15,7 +15,6 @@ */ package com.google.android.exoplayer2.audio; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Util; 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 481ea074a89..d76edd8840f 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 @@ -33,7 +33,6 @@ import androidx.annotation.DoNotInline; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java index b4a20223993..e75c7d9d8b5 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java @@ -15,7 +15,6 @@ */ package com.google.android.exoplayer2.audio; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Util; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java index d651a63364a..2a6f4b5908b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java @@ -19,7 +19,6 @@ import static java.lang.annotation.ElementType.TYPE_USE; import androidx.annotation.IntDef; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java index 66a87ccac93..ccb0091f21b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SonicAudioProcessor.java @@ -18,7 +18,6 @@ import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Util; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java index b820ab1594d..8ffd98837b6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TeeAudioProcessor.java @@ -18,7 +18,6 @@ import static java.lang.Math.min; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessorChain; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java index eacc26cbe1e..81768947029 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessorTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static java.lang.Math.min; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.util.Assertions; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java index c3bda298ae5..5a2af2de848 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java @@ -18,10 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.fail; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; -import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; +import com.google.android.exoplayer2.audio.AudioProcessor.UnhandledAudioFormatException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/TeeAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/TeeAudioProcessorTest.java index df70a838197..6f0a87e97bd 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/TeeAudioProcessorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/TeeAudioProcessorTest.java @@ -17,9 +17,9 @@ import static org.mockito.Mockito.verify; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.audio.TeeAudioProcessor.AudioBufferSink; import org.junit.Before; import org.junit.Rule; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessorTest.java index 1794830d986..19a1ad19c30 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessorTest.java @@ -17,9 +17,9 @@ import static com.google.common.truth.Truth.assertThat; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import java.nio.ByteBuffer; import org.junit.After; import org.junit.Before; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java index 64d02b42139..5f301196f88 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java @@ -21,10 +21,10 @@ import static java.lang.Math.min; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.audio.AudioProcessor; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.util.Util; import java.nio.ByteBuffer; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessor.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessor.java index db812b119e5..62bdc366365 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessor.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessor.java @@ -18,8 +18,8 @@ import static java.lang.Math.min; -import androidx.media3.common.audio.AudioProcessor; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.audio.BaseAudioProcessor; import com.google.android.exoplayer2.audio.SonicAudioProcessor; import com.google.android.exoplayer2.util.Util; diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java index 284eb4f9cd5..43e84c99671 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationException.java @@ -22,10 +22,10 @@ import android.os.SystemClock; import androidx.annotation.IntDef; import androidx.annotation.Nullable; -import androidx.media3.common.audio.AudioProcessor; -import androidx.media3.common.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.PlaybackException; +import com.google.android.exoplayer2.audio.AudioProcessor; +import com.google.android.exoplayer2.audio.AudioProcessor.AudioFormat; import com.google.android.exoplayer2.util.Clock; import com.google.android.exoplayer2.util.FrameProcessingException; import com.google.android.exoplayer2.util.FrameProcessor; diff --git a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessorTest.java b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessorTest.java index 3303f484a29..40399066925 100644 --- a/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessorTest.java +++ b/library/transformer/src/test/java/com/google/android/exoplayer2/transformer/SpeedChangingAudioProcessorTest.java @@ -18,9 +18,9 @@ import static com.google.android.exoplayer2.util.Assertions.checkArgument; import static com.google.common.truth.Truth.assertThat; -import androidx.media3.common.audio.AudioProcessor; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.AudioProcessor; import com.google.android.exoplayer2.util.Util; import java.nio.ByteBuffer; import java.nio.ByteOrder;