From eda7cd240558b871d3c9a1f4160ab59033f68721 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Fri, 20 Jan 2023 15:45:19 +0000 Subject: [PATCH] Rename `FloatResamplingAudioProcessor` to `ToFloatPcmAudioProcessor`. Resampling as a term is overloaded, however it was raised as a confusing term in a meeting recently, as the 1P team initially thought this would change the sample rate. The naming of this `AudioProcessor` now matches `ToInt16PcmAudioProcessor`. PiperOrigin-RevId: 503441019 --- .../java/androidx/media3/exoplayer/audio/DefaultAudioSink.java | 2 +- ...amplingAudioProcessor.java => ToFloatPcmAudioProcessor.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/{FloatResamplingAudioProcessor.java => ToFloatPcmAudioProcessor.java} (97%) 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 fc0f48c913..4bca402490 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 @@ -545,7 +545,7 @@ public final class DefaultAudioSink implements AudioSink { toIntPcmAvailableAudioProcessors = ImmutableList.of( new ToInt16PcmAudioProcessor(), channelMappingAudioProcessor, trimmingAudioProcessor); - toFloatPcmAvailableAudioProcessors = ImmutableList.of(new FloatResamplingAudioProcessor()); + toFloatPcmAvailableAudioProcessors = ImmutableList.of(new ToFloatPcmAudioProcessor()); volume = 1f; audioAttributes = AudioAttributes.DEFAULT; audioSessionId = C.AUDIO_SESSION_ID_UNSET; diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/FloatResamplingAudioProcessor.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ToFloatPcmAudioProcessor.java similarity index 97% rename from libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/FloatResamplingAudioProcessor.java rename to libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ToFloatPcmAudioProcessor.java index c1554f508e..7531daaaad 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/FloatResamplingAudioProcessor.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/ToFloatPcmAudioProcessor.java @@ -33,7 +33,7 @@ import java.nio.ByteBuffer; *
  • {@link C#ENCODING_PCM_FLOAT} ({@link #isActive()} will return {@code false}) * */ -/* package */ final class FloatResamplingAudioProcessor extends BaseAudioProcessor { +/* package */ final class ToFloatPcmAudioProcessor extends BaseAudioProcessor { private static final int FLOAT_NAN_AS_INT = Float.floatToIntBits(Float.NaN); private static final double PCM_32_BIT_INT_TO_PCM_32_BIT_FLOAT_FACTOR = 1.0 / 0x7FFFFFFF;