From daa45a16bd69669cb3862c3969fa1e5eb1b1ddde Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 2 Feb 2022 15:03:13 +0000 Subject: [PATCH] Fix parameter comments PiperOrigin-RevId: 425874534 --- .../src/main/java/androidx/media3/common/MediaItem.java | 2 +- .../java/androidx/media3/decoder/flac/FlacExtractor.java | 2 +- .../media3/exoplayer/source/ProgressiveMediaPeriod.java | 2 +- .../androidx/media3/exoplayer/rtsp/reader/RtpAacReader.java | 2 +- .../androidx/media3/exoplayer/rtsp/reader/RtpAc3Reader.java | 6 +++--- .../media3/exoplayer/rtsp/reader/RtpH264Reader.java | 6 +----- .../java/androidx/media3/extractor/amr/AmrExtractor.java | 2 +- .../java/androidx/media3/extractor/flac/FlacExtractor.java | 2 +- .../main/java/androidx/media3/extractor/ts/H263Reader.java | 2 +- .../java/androidx/media3/extractor/wav/WavExtractor.java | 4 ++-- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/MediaItem.java b/libraries/common/src/main/java/androidx/media3/common/MediaItem.java index 1ec4578599..106bbeb959 100644 --- a/libraries/common/src/main/java/androidx/media3/common/MediaItem.java +++ b/libraries/common/src/main/java/androidx/media3/common/MediaItem.java @@ -1839,7 +1839,7 @@ public final class MediaItem implements Bundleable { return new MediaItem( mediaId, clippingConfiguration, - /* playbackProperties= */ null, + /* localConfiguration= */ null, liveConfiguration, mediaMetadata); } diff --git a/libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/FlacExtractor.java b/libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/FlacExtractor.java index 61b8462567..e65e2de18a 100644 --- a/libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/FlacExtractor.java +++ b/libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/FlacExtractor.java @@ -288,7 +288,7 @@ public final class FlacExtractor implements Extractor { sampleData.setPosition(0); output.sampleData(sampleData, size); output.sampleMetadata( - timeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* encryptionData= */ null); + timeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* cryptoData= */ null); } /** A {@link SeekMap} implementation using a SeekTable within the Flac stream. */ diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java index 472c56be9a..e5e74de76e 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ProgressiveMediaPeriod.java @@ -1071,7 +1071,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; TrackOutput icyTrackOutput = Assertions.checkNotNull(this.icyTrackOutput); icyTrackOutput.sampleData(metadata, length); icyTrackOutput.sampleMetadata( - timeUs, C.BUFFER_FLAG_KEY_FRAME, length, /* offset= */ 0, /* encryptionData= */ null); + timeUs, C.BUFFER_FLAG_KEY_FRAME, length, /* offset= */ 0, /* cryptoData= */ null); seenIcyMetadata = true; } diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAacReader.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAacReader.java index 1a55dfac0c..869ad20f6f 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAacReader.java +++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAacReader.java @@ -151,7 +151,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; private static void outputSampleMetadata(TrackOutput trackOutput, long sampleTimeUs, int size) { trackOutput.sampleMetadata( - sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* encryptionData= */ null); + sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* cryptoData= */ null); } /** Returns the correct sample time from RTP timestamp, accounting for the AAC sampling rate. */ diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAc3Reader.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAc3Reader.java index 8d2f062660..b69673f5eb 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAc3Reader.java +++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpAc3Reader.java @@ -140,7 +140,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; /* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* size= */ frameSize, /* offset= */ 0, - /* encryptionData= */ null); + /* cryptoData= */ null); } private void processMultiFramePacket(ParsableByteArray data, int numOfFrames, long sampleTimeUs) { @@ -159,7 +159,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; /* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* size= */ frameInfo.frameSize, /* offset= */ 0, - /* encryptionData= */ null); + /* cryptoData= */ null); sampleTimeUs += (frameInfo.sampleCount / frameInfo.sampleRate) * C.MICROS_PER_SECOND; // Advance the position by the number of bytes read. @@ -205,7 +205,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; /* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* size= */ numBytesPendingMetadataOutput, /* offset= */ 0, - /* encryptionData= */ null); + /* cryptoData= */ null); numBytesPendingMetadataOutput = 0; } diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java index 05c265cef4..6895010b75 100644 --- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java +++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/reader/RtpH264Reader.java @@ -117,11 +117,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; long timeUs = toSampleUs(startTimeOffsetUs, timestamp, firstReceivedTimestamp); trackOutput.sampleMetadata( - timeUs, - bufferFlags, - fragmentedSampleSizeBytes, - /* offset= */ 0, - /* encryptionData= */ null); + timeUs, bufferFlags, fragmentedSampleSizeBytes, /* offset= */ 0, /* cryptoData= */ null); fragmentedSampleSizeBytes = 0; } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java index f1f6a2ce5a..ba8610101a 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java @@ -319,7 +319,7 @@ public final class AmrExtractor implements Extractor { C.BUFFER_FLAG_KEY_FRAME, currentSampleSize, /* offset= */ 0, - /* encryptionData= */ null); + /* cryptoData= */ null); currentSampleTimeUs += SAMPLE_TIME_PER_FRAME_US; return RESULT_CONTINUE; } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/flac/FlacExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/flac/FlacExtractor.java index b2ab510ad6..f7256aff41 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/flac/FlacExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/flac/FlacExtractor.java @@ -416,6 +416,6 @@ public final class FlacExtractor implements Extractor { C.BUFFER_FLAG_KEY_FRAME, currentFrameBytesWritten, /* offset= */ 0, - /* encryptionData= */ null); + /* cryptoData= */ null); } } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java index 9e1f7e7d1d..11ec5a3532 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java @@ -475,7 +475,7 @@ public final class H263Reader implements ElementaryStreamReader { int size = (int) (position - samplePosition); @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0; output.sampleMetadata( - sampleTimeUs, flags, size, bytesWrittenPastPosition, /* encryptionData= */ null); + sampleTimeUs, flags, size, bytesWrittenPastPosition, /* cryptoData= */ null); } // Start a new sample, unless this is a 'group of video object plane' in which case we // include the data at the start of a 'video object plane' coming next. diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/wav/WavExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/wav/WavExtractor.java index 2d1d5cff53..aee49edfe4 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/wav/WavExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/wav/WavExtractor.java @@ -369,7 +369,7 @@ public final class WavExtractor implements Extractor { int size = pendingFrames * bytesPerFrame; int offset = pendingOutputBytes - size; trackOutput.sampleMetadata( - timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null); + timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null); outputFrameCount += pendingFrames; pendingOutputBytes = offset; } @@ -548,7 +548,7 @@ public final class WavExtractor implements Extractor { int size = numOutputFramesToBytes(sampleFrames); int offset = pendingOutputBytes - size; trackOutput.sampleMetadata( - timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null); + timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null); outputFrameCount += sampleFrames; pendingOutputBytes -= size; }