Avoid using unneeded double ended queue.

These usages have no need for the double ended input functionality. All
other usages across media3 are ConcurrentLinkedQueue.

PiperOrigin-RevId: 584841104
This commit is contained in:
samrobinson 2023-11-23 02:48:54 -08:00 committed by Copybara-Service
parent 0f040e6c6e
commit 1524d12634
2 changed files with 6 additions and 6 deletions

View file

@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableList;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
/** /**
@ -72,14 +72,14 @@ import java.util.concurrent.atomic.AtomicReference;
AudioFormat inputAudioFormat = new AudioFormat(inputFormat); AudioFormat inputAudioFormat = new AudioFormat(inputFormat);
checkArgument(isInputAudioFormatValid(inputAudioFormat), /* errorMessage= */ inputAudioFormat); checkArgument(isInputAudioFormatValid(inputAudioFormat), /* errorMessage= */ inputAudioFormat);
availableInputBuffers = new ConcurrentLinkedDeque<>(); availableInputBuffers = new ConcurrentLinkedQueue<>();
ByteBuffer emptyBuffer = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder()); ByteBuffer emptyBuffer = ByteBuffer.allocateDirect(0).order(ByteOrder.nativeOrder());
for (int i = 0; i < MAX_INPUT_BUFFER_COUNT; i++) { for (int i = 0; i < MAX_INPUT_BUFFER_COUNT; i++) {
DecoderInputBuffer inputBuffer = new DecoderInputBuffer(BUFFER_REPLACEMENT_MODE_DIRECT); DecoderInputBuffer inputBuffer = new DecoderInputBuffer(BUFFER_REPLACEMENT_MODE_DIRECT);
inputBuffer.data = emptyBuffer; inputBuffer.data = emptyBuffer;
availableInputBuffers.add(inputBuffer); availableInputBuffers.add(inputBuffer);
} }
pendingInputBuffers = new ConcurrentLinkedDeque<>(); pendingInputBuffers = new ConcurrentLinkedQueue<>();
pendingMediaItemChange = new AtomicReference<>(); pendingMediaItemChange = new AtomicReference<>();
silentAudioGenerator = new SilentAudioGenerator(inputAudioFormat); silentAudioGenerator = new SilentAudioGenerator(inputAudioFormat);
audioProcessingPipeline = audioProcessingPipeline =

View file

@ -26,7 +26,7 @@ import androidx.media3.decoder.DecoderInputBuffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
/** Muxes encoded samples without any transcoding or transformation. */ /** Muxes encoded samples without any transcoding or transformation. */
@ -73,8 +73,8 @@ import java.util.concurrent.atomic.AtomicLong;
this.format = format; this.format = format;
this.initialTimestampOffsetUs = initialTimestampOffsetUs; this.initialTimestampOffsetUs = initialTimestampOffsetUs;
nextMediaItemOffsetUs = new AtomicLong(); nextMediaItemOffsetUs = new AtomicLong();
availableInputBuffers = new ConcurrentLinkedDeque<>(); availableInputBuffers = new ConcurrentLinkedQueue<>();
pendingInputBuffers = new ConcurrentLinkedDeque<>(); pendingInputBuffers = new ConcurrentLinkedQueue<>();
fallbackListener.onTransformationRequestFinalized(transformationRequest); fallbackListener.onTransformationRequestFinalized(transformationRequest);
} }