From 3c4b4729da4f4a9df70d31891e7ece9e233a5ee3 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Thu, 12 Jan 2023 16:43:31 +0000
Subject: [PATCH] Make ToInt16AudioProcessor available in `common.audio`.

PiperOrigin-RevId: 501575932
---
 .../media3/common/audio/ToInt16PcmAudioProcessor.java}    | 8 ++++----
 .../androidx/media3/exoplayer/audio/DefaultAudioSink.java | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename libraries/{exoplayer/src/main/java/androidx/media3/exoplayer/audio/ResamplingAudioProcessor.java => common/src/main/java/androidx/media3/common/audio/ToInt16PcmAudioProcessor.java} (95%)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ResamplingAudioProcessor.java b/libraries/common/src/main/java/androidx/media3/common/audio/ToInt16PcmAudioProcessor.java
similarity index 95%
rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ResamplingAudioProcessor.java
rename to libraries/common/src/main/java/androidx/media3/common/audio/ToInt16PcmAudioProcessor.java
index 549fa0f888..94d594141c 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ResamplingAudioProcessor.java
+++ b/libraries/common/src/main/java/androidx/media3/common/audio/ToInt16PcmAudioProcessor.java
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.media3.exoplayer.audio;
+package androidx.media3.common.audio;
 
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
-import androidx.media3.common.audio.AudioProcessor;
-import androidx.media3.common.audio.BaseAudioProcessor;
+import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.nio.ByteBuffer;
@@ -36,7 +35,8 @@ import java.nio.ByteBuffer;
  *   <li>{@link C#ENCODING_PCM_FLOAT}
  * </ul>
  */
-/* package */ final class ResamplingAudioProcessor extends BaseAudioProcessor {
+@UnstableApi
+public final class ToInt16PcmAudioProcessor extends BaseAudioProcessor {
 
   @Override
   @CanIgnoreReturnValue
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
index 7da81dfba1..44480b53da 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
@@ -48,6 +48,7 @@ import androidx.media3.common.PlaybackParameters;
 import androidx.media3.common.audio.AudioProcessingPipeline;
 import androidx.media3.common.audio.AudioProcessor;
 import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException;
+import androidx.media3.common.audio.ToInt16PcmAudioProcessor;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.Clock;
 import androidx.media3.common.util.ConditionVariable;
@@ -542,7 +543,7 @@ public final class DefaultAudioSink implements AudioSink {
     trimmingAudioProcessor = new TrimmingAudioProcessor();
     toIntPcmAvailableAudioProcessors =
         ImmutableList.of(
-            new ResamplingAudioProcessor(), channelMappingAudioProcessor, trimmingAudioProcessor);
+            new ToInt16PcmAudioProcessor(), channelMappingAudioProcessor, trimmingAudioProcessor);
     toFloatPcmAvailableAudioProcessors = ImmutableList.of(new FloatResamplingAudioProcessor());
     volume = 1f;
     audioAttributes = AudioAttributes.DEFAULT;