From b6e0ade9395c8d7ca0e6d83a2608c7bd67ff9550 Mon Sep 17 00:00:00 2001 From: kimvde Date: Wed, 8 Sep 2021 16:33:29 +0100 Subject: [PATCH] Rename transformer renderer methods to make them match #exofixit PiperOrigin-RevId: 395479329 --- .../transformer/TransformerAudioRenderer.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java index 6504151db5..6b1d0f3b90 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java @@ -118,15 +118,15 @@ import java.nio.ByteBuffer; if (ensureDecoderConfigured()) { if (ensureEncoderAndAudioProcessingConfigured()) { - while (drainEncoderToFeedMuxer()) {} + while (feedMuxerFromEncoder()) {} if (sonicAudioProcessor.isActive()) { - while (drainSonicToFeedEncoder()) {} - while (drainDecoderToFeedSonic()) {} + while (feedEncoderFromSonic()) {} + while (feedSonicFromDecoder()) {} } else { - while (drainDecoderToFeedEncoder()) {} + while (feedEncoderFromDecoder()) {} } } - while (feedDecoderInputFromSource()) {} + while (feedDecoderFromInput()) {} } } @@ -134,7 +134,7 @@ import java.nio.ByteBuffer; * Attempts to write encoder output data to the muxer, and returns whether it may be possible to * write more data immediately by calling this method again. */ - private boolean drainEncoderToFeedMuxer() { + private boolean feedMuxerFromEncoder() { MediaCodecAdapterWrapper encoder = checkNotNull(this.encoder); if (!hasEncoderOutputFormat) { @Nullable Format encoderOutputFormat = encoder.getOutputFormat(); @@ -170,7 +170,7 @@ import java.nio.ByteBuffer; * Attempts to pass decoder output data to the encoder, and returns whether it may be possible to * pass more data immediately by calling this method again. */ - private boolean drainDecoderToFeedEncoder() { + private boolean feedEncoderFromDecoder() { MediaCodecAdapterWrapper decoder = checkNotNull(this.decoder); MediaCodecAdapterWrapper encoder = checkNotNull(this.encoder); if (!encoder.maybeDequeueInputBuffer(encoderInputBuffer)) { @@ -201,7 +201,7 @@ import java.nio.ByteBuffer; * Attempts to pass audio processor output data to the encoder, and returns whether it may be * possible to pass more data immediately by calling this method again. */ - private boolean drainSonicToFeedEncoder() { + private boolean feedEncoderFromSonic() { MediaCodecAdapterWrapper encoder = checkNotNull(this.encoder); if (!encoder.maybeDequeueInputBuffer(encoderInputBuffer)) { return false; @@ -225,7 +225,7 @@ import java.nio.ByteBuffer; * Attempts to process decoder output data, and returns whether it may be possible to process more * data immediately by calling this method again. */ - private boolean drainDecoderToFeedSonic() { + private boolean feedSonicFromDecoder() { MediaCodecAdapterWrapper decoder = checkNotNull(this.decoder); if (drainingSonicForSpeedChange) { @@ -268,7 +268,7 @@ import java.nio.ByteBuffer; * Attempts to pass input data to the decoder, and returns whether it may be possible to pass more * data immediately by calling this method again. */ - private boolean feedDecoderInputFromSource() { + private boolean feedDecoderFromInput() { MediaCodecAdapterWrapper decoder = checkNotNull(this.decoder); if (!decoder.maybeDequeueInputBuffer(decoderInputBuffer)) { return false;