Make ToInt16AudioProcessor available in common.audio.

PiperOrigin-RevId: 501575932
This commit is contained in:
samrobinson 2023-01-12 16:43:31 +00:00 committed by Rohit Singh
parent e47307d95f
commit 3c4b4729da
2 changed files with 6 additions and 5 deletions

View File

@ -13,12 +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.exoplayer.audio; package androidx.media3.common.audio;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.audio.AudioProcessor; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.audio.BaseAudioProcessor;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -36,7 +35,8 @@ import java.nio.ByteBuffer;
* <li>{@link C#ENCODING_PCM_FLOAT} * <li>{@link C#ENCODING_PCM_FLOAT}
* </ul> * </ul>
*/ */
/* package */ final class ResamplingAudioProcessor extends BaseAudioProcessor { @UnstableApi
public final class ToInt16PcmAudioProcessor extends BaseAudioProcessor {
@Override @Override
@CanIgnoreReturnValue @CanIgnoreReturnValue

View File

@ -48,6 +48,7 @@ import androidx.media3.common.PlaybackParameters;
import androidx.media3.common.audio.AudioProcessingPipeline; import androidx.media3.common.audio.AudioProcessingPipeline;
import androidx.media3.common.audio.AudioProcessor; import androidx.media3.common.audio.AudioProcessor;
import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException; import androidx.media3.common.audio.AudioProcessor.UnhandledAudioFormatException;
import androidx.media3.common.audio.ToInt16PcmAudioProcessor;
import androidx.media3.common.util.Assertions; import androidx.media3.common.util.Assertions;
import androidx.media3.common.util.Clock; import androidx.media3.common.util.Clock;
import androidx.media3.common.util.ConditionVariable; import androidx.media3.common.util.ConditionVariable;
@ -542,7 +543,7 @@ public final class DefaultAudioSink implements AudioSink {
trimmingAudioProcessor = new TrimmingAudioProcessor(); trimmingAudioProcessor = new TrimmingAudioProcessor();
toIntPcmAvailableAudioProcessors = toIntPcmAvailableAudioProcessors =
ImmutableList.of( ImmutableList.of(
new ResamplingAudioProcessor(), channelMappingAudioProcessor, trimmingAudioProcessor); new ToInt16PcmAudioProcessor(), channelMappingAudioProcessor, trimmingAudioProcessor);
toFloatPcmAvailableAudioProcessors = ImmutableList.of(new FloatResamplingAudioProcessor()); toFloatPcmAvailableAudioProcessors = ImmutableList.of(new FloatResamplingAudioProcessor());
volume = 1f; volume = 1f;
audioAttributes = AudioAttributes.DEFAULT; audioAttributes = AudioAttributes.DEFAULT;