loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames containsKey to contains so it's more readable

Browse Source 
PiperOrigin-RevId: 561916837
This commit is contained in:
claincly 2023-09-01 04:22:56 -07:00 committed by Copybara-Service
parent f6be4bc526
commit 6c2713f153
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View File

@ -523,7 +523,7 @@ public final class Util {
* <p>This implements {@code SparseArray#contains} for lower API versions. * <p>This implements {@code SparseArray#contains} for lower API versions.
*/ */
@UnstableApi @UnstableApi
public static <T> boolean containsKey(SparseArray<T> sparseArray, int key) { public static <T> boolean contains(SparseArray<T> sparseArray, int key) {
return sparseArray.indexOfKey(key) >= 0; return sparseArray.indexOfKey(key) >= 0;
} }

10
libraries/effect/src/main/java/androidx/media3/effect/InputSwitcher.java
View File

@ -23,7 +23,7 @@ import static androidx.media3.common.VideoFrameProcessor.INPUT_TYPE_TEXTURE_ID;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull; import static androidx.media3.common.util.Assertions.checkStateNotNull;
import static androidx.media3.common.util.Util.containsKey; import static androidx.media3.common.util.Util.contains;
import android.content.Context; import android.content.Context;
import android.util.SparseArray; import android.util.SparseArray;
@ -169,7 +169,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public void switchToInput( public void switchToInput(
@VideoFrameProcessor.InputType int newInputType, FrameInfo inputFrameInfo) { @VideoFrameProcessor.InputType int newInputType, FrameInfo inputFrameInfo) {
checkStateNotNull(downstreamShaderProgram); checkStateNotNull(downstreamShaderProgram);
checkState(containsKey(inputs, newInputType), "Input type not registered: " + newInputType); checkState(contains(inputs, newInputType), "Input type not registered: " + newInputType);
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
@VideoFrameProcessor.InputType int inputType = inputs.keyAt(i); @VideoFrameProcessor.InputType int inputType = inputs.keyAt(i);
@ -223,7 +223,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* {@linkplain #registerInput registered}. * {@linkplain #registerInput registered}.
*/ */
public Surface getInputSurface() { public Surface getInputSurface() {
checkState(containsKey(inputs, INPUT_TYPE_SURFACE)); checkState(contains(inputs, INPUT_TYPE_SURFACE));
return inputs.get(INPUT_TYPE_SURFACE).textureManager.getInputSurface(); return inputs.get(INPUT_TYPE_SURFACE).textureManager.getInputSurface();
} }
@ -234,7 +234,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* {@linkplain #registerInput registered}. * {@linkplain #registerInput registered}.
*/ */
public void setInputDefaultBufferSize(int width, int height) { public void setInputDefaultBufferSize(int width, int height) {
checkState(containsKey(inputs, INPUT_TYPE_SURFACE)); checkState(contains(inputs, INPUT_TYPE_SURFACE));
inputs.get(INPUT_TYPE_SURFACE).textureManager.setDefaultBufferSize(width, height); inputs.get(INPUT_TYPE_SURFACE).textureManager.setDefaultBufferSize(width, height);
} }
@ -245,7 +245,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* {@linkplain #registerInput registered}. * {@linkplain #registerInput registered}.
*/ */
public void setOnInputFrameProcessedListener(OnInputFrameProcessedListener listener) { public void setOnInputFrameProcessedListener(OnInputFrameProcessedListener listener) {
checkState(containsKey(inputs, INPUT_TYPE_TEXTURE_ID)); checkState(contains(inputs, INPUT_TYPE_TEXTURE_ID));
inputs.get(INPUT_TYPE_TEXTURE_ID).textureManager.setOnInputFrameProcessedListener(listener); inputs.get(INPUT_TYPE_TEXTURE_ID).textureManager.setOnInputFrameProcessedListener(listener);
} }

6
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultAudioMixer.java
View File

@ -18,7 +18,7 @@ package androidx.media3.transformer;
import static androidx.media3.common.audio.AudioProcessor.EMPTY_BUFFER; import static androidx.media3.common.audio.AudioProcessor.EMPTY_BUFFER;
import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Util.containsKey; import static androidx.media3.common.util.Util.contains;
import static java.lang.Math.max; import static java.lang.Math.max;
import static java.lang.Math.min; import static java.lang.Math.min;
@ -174,7 +174,7 @@ public final class DefaultAudioMixer implements AudioMixer {
@Override @Override
public boolean hasSource(int sourceId) { public boolean hasSource(int sourceId) {
checkStateIsConfigured(); checkStateIsConfigured();
return containsKey(sources, sourceId); return contains(sources, sourceId);
} }
@Override @Override
@ -319,7 +319,7 @@ public final class DefaultAudioMixer implements AudioMixer {
} }
private SourceInfo getSourceById(int sourceId) { private SourceInfo getSourceById(int sourceId) {
checkState(containsKey(sources, sourceId), "Source not found."); checkState(contains(sources, sourceId), "Source not found.");
return sources.get(sourceId); return sources.get(sourceId);
} }

8
libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java
View File

@ -19,7 +19,7 @@ package androidx.media3.transformer;
import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Util.containsKey; import static androidx.media3.common.util.Util.contains;
import static java.lang.Math.max; import static java.lang.Math.max;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
@ -185,7 +185,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
"Unsupported track format: " + sampleMimeType); "Unsupported track format: " + sampleMimeType);
checkState( checkState(
!containsKey(trackTypeToInfo, trackType), "There is already a track of type " + trackType); !contains(trackTypeToInfo, trackType), "There is already a track of type " + trackType);
ensureMuxerInitialized(); ensureMuxerInitialized();
@ -227,7 +227,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
public boolean writeSample( public boolean writeSample(
@C.TrackType int trackType, ByteBuffer data, boolean isKeyFrame, long presentationTimeUs) @C.TrackType int trackType, ByteBuffer data, boolean isKeyFrame, long presentationTimeUs)
throws Muxer.MuxerException { throws Muxer.MuxerException {
checkArgument(containsKey(trackTypeToInfo, trackType)); checkArgument(contains(trackTypeToInfo, trackType));
TrackInfo trackInfo = trackTypeToInfo.get(trackType); TrackInfo trackInfo = trackTypeToInfo.get(trackType);
boolean canWriteSample = canWriteSample(trackType, presentationTimeUs); boolean canWriteSample = canWriteSample(trackType, presentationTimeUs);
if (trackType == C.TRACK_TYPE_VIDEO) { if (trackType == C.TRACK_TYPE_VIDEO) {
@ -269,7 +269,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
* @param trackType The {@link C.TrackType}. * @param trackType The {@link C.TrackType}.
*/ */
public void endTrack(@C.TrackType int trackType) { public void endTrack(@C.TrackType int trackType) {
if (!containsKey(trackTypeToInfo, trackType)) { if (!contains(trackTypeToInfo, trackType)) {
return; return;
} }

25
libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java
View File

@ -18,7 +18,7 @@ package androidx.media3.transformer;
import static androidx.media3.common.util.Assertions.checkArgument; import static androidx.media3.common.util.Assertions.checkArgument;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Util.containsKey; import static androidx.media3.common.util.Util.contains;
import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_DECODED; import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_DECODED;
import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_ENCODED; import static androidx.media3.transformer.AssetLoader.SUPPORTED_OUTPUT_TYPE_ENCODED;
import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR; import static androidx.media3.transformer.Composition.HDR_MODE_KEEP_HDR;
@ -801,7 +801,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public Format getAssetLoaderInputFormat(int sequenceIndex, @C.TrackType int trackType) { public Format getAssetLoaderInputFormat(int sequenceIndex, @C.TrackType int trackType) {
SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat = SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat =
sequencesMetadata.get(sequenceIndex).trackTypeToFirstAssetLoaderInputFormat; sequencesMetadata.get(sequenceIndex).trackTypeToFirstAssetLoaderInputFormat;
checkState(containsKey(trackTypeToFirstAssetLoaderInputFormat, trackType)); checkState(contains(trackTypeToFirstAssetLoaderInputFormat, trackType));
return trackTypeToFirstAssetLoaderInputFormat.get(trackType); return trackTypeToFirstAssetLoaderInputFormat.get(trackType);
} }
@ -842,7 +842,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@C.TrackType int trackType = getProcessedTrackType(assetLoaderInputFormat.sampleMimeType); @C.TrackType int trackType = getProcessedTrackType(assetLoaderInputFormat.sampleMimeType);
SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat = SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat =
sequencesMetadata.get(sequenceIndex).trackTypeToFirstAssetLoaderInputFormat; sequencesMetadata.get(sequenceIndex).trackTypeToFirstAssetLoaderInputFormat;
checkState(!containsKey(trackTypeToFirstAssetLoaderInputFormat, trackType)); checkState(!contains(trackTypeToFirstAssetLoaderInputFormat, trackType));
trackTypeToFirstAssetLoaderInputFormat.put(trackType, assetLoaderInputFormat); trackTypeToFirstAssetLoaderInputFormat.put(trackType, assetLoaderInputFormat);
} }
@ -850,7 +850,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
* Returns the index of the primary sequence for a given {@link C.TrackType trackType}. * Returns the index of the primary sequence for a given {@link C.TrackType trackType}.
* *
* <p>A primary sequence for a {@link C.TrackType trackType} is defined as the lowest indexed * <p>A primary sequence for a {@link C.TrackType trackType} is defined as the lowest indexed
* sequence that containsKey a track of the given {@code trackType}. * sequence that contains a track of the given {@code trackType}.
*/ */
public int getIndexForPrimarySequence(@C.TrackType int trackType) { public int getIndexForPrimarySequence(@C.TrackType int trackType) {
checkState( checkState(
@ -859,7 +859,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
for (int i = 0; i < sequencesMetadata.size(); i++) { for (int i = 0; i < sequencesMetadata.size(); i++) {
SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat = SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat =
sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat; sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat;
if (containsKey(trackTypeToFirstAssetLoaderInputFormat, trackType)) { if (contains(trackTypeToFirstAssetLoaderInputFormat, trackType)) {
return i; return i;
} }
} }
@ -890,7 +890,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/ */
public void registerGraphInput(@C.TrackType int trackType) { public void registerGraphInput(@C.TrackType int trackType) {
int numberOfGraphInputForTrackType = 1; int numberOfGraphInputForTrackType = 1;
if (containsKey(trackTypeToNumberOfRegisteredGraphInput, trackType)) { if (contains(trackTypeToNumberOfRegisteredGraphInput, trackType)) {
numberOfGraphInputForTrackType += trackTypeToNumberOfRegisteredGraphInput.get(trackType); numberOfGraphInputForTrackType += trackTypeToNumberOfRegisteredGraphInput.get(trackType);
} }
trackTypeToNumberOfRegisteredGraphInput.put(trackType, numberOfGraphInputForTrackType); trackTypeToNumberOfRegisteredGraphInput.put(trackType, numberOfGraphInputForTrackType);
@ -903,8 +903,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public boolean hasAssociatedAllTracksWithGraphInput(@C.TrackType int trackType) { public boolean hasAssociatedAllTracksWithGraphInput(@C.TrackType int trackType) {
int numberOfTracksForTrackType = 0; int numberOfTracksForTrackType = 0;
for (int i = 0; i < sequencesMetadata.size(); i++) { for (int i = 0; i < sequencesMetadata.size(); i++) {
if (containsKey( if (contains(sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat, trackType)) {
sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat, trackType)) {
numberOfTracksForTrackType++; numberOfTracksForTrackType++;
} }
} }
@ -918,10 +917,10 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
for (int i = 0; i < sequencesMetadata.size(); i++) { for (int i = 0; i < sequencesMetadata.size(); i++) {
SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat = SparseArray<Format> trackTypeToFirstAssetLoaderInputFormat =
sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat; sequencesMetadata.get(i).trackTypeToFirstAssetLoaderInputFormat;
if (containsKey(trackTypeToFirstAssetLoaderInputFormat, C.TRACK_TYPE_AUDIO)) { if (contains(trackTypeToFirstAssetLoaderInputFormat, C.TRACK_TYPE_AUDIO)) {
outputHasAudio = true; outputHasAudio = true;
} }
if (containsKey(trackTypeToFirstAssetLoaderInputFormat, C.TRACK_TYPE_VIDEO)) { if (contains(trackTypeToFirstAssetLoaderInputFormat, C.TRACK_TYPE_VIDEO)) {
outputHasVideo = true; outputHasVideo = true;
} }
} }
@ -931,14 +930,14 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** Registers a {@link SampleExporter} for the given {@link C.TrackType trackType}. */ /** Registers a {@link SampleExporter} for the given {@link C.TrackType trackType}. */
public void registerSampleExporter(int trackType, SampleExporter sampleExporter) { public void registerSampleExporter(int trackType, SampleExporter sampleExporter) {
checkState( checkState(
!containsKey(trackTypeToSampleExporter, trackType), !contains(trackTypeToSampleExporter, trackType),
"Exactly one SampleExporter can be added for each track type."); "Exactly one SampleExporter can be added for each track type.");
trackTypeToSampleExporter.put(trackType, sampleExporter); trackTypeToSampleExporter.put(trackType, sampleExporter);
} }
/** Sets whether a track should be transcoded. */ /** Sets whether a track should be transcoded. */
public void setShouldTranscode(@C.TrackType int trackType, boolean shouldTranscode) { public void setShouldTranscode(@C.TrackType int trackType, boolean shouldTranscode) {
if (containsKey(trackTypeToShouldTranscode, trackType)) { if (contains(trackTypeToShouldTranscode, trackType)) {
checkState(shouldTranscode == trackTypeToShouldTranscode.get(trackType)); checkState(shouldTranscode == trackTypeToShouldTranscode.get(trackType));
return; return;
} }
@ -947,7 +946,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** Returns whether a track should be transcoded. */ /** Returns whether a track should be transcoded. */
public boolean shouldTranscode(@C.TrackType int trackType) { public boolean shouldTranscode(@C.TrackType int trackType) {
checkState(containsKey(trackTypeToShouldTranscode, trackType)); checkState(contains(trackTypeToShouldTranscode, trackType));
return trackTypeToShouldTranscode.get(trackType); return trackTypeToShouldTranscode.get(trackType);
} }