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

Fix parameter comments

Browse Source 
PiperOrigin-RevId: 425874534
This commit is contained in:
ibaker 2022-02-02 15:03:13 +00:00 committed by Ian Baker
parent d3b46f1c70
commit 032df64f15
10 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
View File

@ -286,7 +286,7 @@ public final class FlacExtractor implements Extractor {
sampleData.setPosition(0); sampleData.setPosition(0);
output.sampleData(sampleData, size); output.sampleData(sampleData, size);
output.sampleMetadata( 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. */ /** A {@link SeekMap} implementation using a SeekTable within the Flac stream. */

2
library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
View File

@ -1800,7 +1800,7 @@ public final class MediaItem implements Bundleable {
return new MediaItem( return new MediaItem(
mediaId, mediaId,
clippingConfiguration, clippingConfiguration,
/* playbackProperties= */ null, /* localConfiguration= */ null,
liveConfiguration, liveConfiguration,
mediaMetadata); mediaMetadata);
} }

2
library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
View File

@ -1069,7 +1069,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
TrackOutput icyTrackOutput = Assertions.checkNotNull(this.icyTrackOutput); TrackOutput icyTrackOutput = Assertions.checkNotNull(this.icyTrackOutput);
icyTrackOutput.sampleData(metadata, length); icyTrackOutput.sampleData(metadata, length);
icyTrackOutput.sampleMetadata( 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; seenIcyMetadata = true;
} }

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
View File

@ -317,7 +317,7 @@ public final class AmrExtractor implements Extractor {
C.BUFFER_FLAG_KEY_FRAME, C.BUFFER_FLAG_KEY_FRAME,
currentSampleSize, currentSampleSize,
/* offset= */ 0, /* offset= */ 0,
/* encryptionData= */ null); /* cryptoData= */ null);
currentSampleTimeUs += SAMPLE_TIME_PER_FRAME_US; currentSampleTimeUs += SAMPLE_TIME_PER_FRAME_US;
return RESULT_CONTINUE; return RESULT_CONTINUE;
} }

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
View File

@ -414,6 +414,6 @@ public final class FlacExtractor implements Extractor {
C.BUFFER_FLAG_KEY_FRAME, C.BUFFER_FLAG_KEY_FRAME,
currentFrameBytesWritten, currentFrameBytesWritten,
/* offset= */ 0, /* offset= */ 0,
/* encryptionData= */ null); /* cryptoData= */ null);
} }
} }

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H263Reader.java
View File

@ -473,7 +473,7 @@ public final class H263Reader implements ElementaryStreamReader {
int size = (int) (position - samplePosition); int size = (int) (position - samplePosition);
@C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0; @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
output.sampleMetadata( 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 // 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. // include the data at the start of a 'video object plane' coming next.

4
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
View File

@ -367,7 +367,7 @@ public final class WavExtractor implements Extractor {
int size = pendingFrames * bytesPerFrame; int size = pendingFrames * bytesPerFrame;
int offset = pendingOutputBytes - size; int offset = pendingOutputBytes - size;
trackOutput.sampleMetadata( trackOutput.sampleMetadata(
timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null); timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null);
outputFrameCount += pendingFrames; outputFrameCount += pendingFrames;
pendingOutputBytes = offset; pendingOutputBytes = offset;
} }
@ -546,7 +546,7 @@ public final class WavExtractor implements Extractor {
int size = numOutputFramesToBytes(sampleFrames); int size = numOutputFramesToBytes(sampleFrames);
int offset = pendingOutputBytes - size; int offset = pendingOutputBytes - size;
trackOutput.sampleMetadata( trackOutput.sampleMetadata(
timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null); timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null);
outputFrameCount += sampleFrames; outputFrameCount += sampleFrames;
pendingOutputBytes -= size; pendingOutputBytes -= size;
} }

2
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java
View File

@ -151,7 +151,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private static void outputSampleMetadata(TrackOutput trackOutput, long sampleTimeUs, int size) { private static void outputSampleMetadata(TrackOutput trackOutput, long sampleTimeUs, int size) {
trackOutput.sampleMetadata( 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. */ /** Returns the correct sample time from RTP timestamp, accounting for the AAC sampling rate. */

6
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java
View File

@ -138,7 +138,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
/* size= */ frameSize, /* size= */ frameSize,
/* offset= */ 0, /* offset= */ 0,
/* encryptionData= */ null); /* cryptoData= */ null);
} }
private void processMultiFramePacket(ParsableByteArray data, int numOfFrames, long sampleTimeUs) { private void processMultiFramePacket(ParsableByteArray data, int numOfFrames, long sampleTimeUs) {
@ -157,7 +157,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
/* size= */ frameInfo.frameSize, /* size= */ frameInfo.frameSize,
/* offset= */ 0, /* offset= */ 0,
/* encryptionData= */ null); /* cryptoData= */ null);
sampleTimeUs += (frameInfo.sampleCount / frameInfo.sampleRate) * C.MICROS_PER_SECOND; sampleTimeUs += (frameInfo.sampleCount / frameInfo.sampleRate) * C.MICROS_PER_SECOND;
// Advance the position by the number of bytes read. // Advance the position by the number of bytes read.
@ -203,7 +203,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/* flags= */ C.BUFFER_FLAG_KEY_FRAME, /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
/* size= */ numBytesPendingMetadataOutput, /* size= */ numBytesPendingMetadataOutput,
/* offset= */ 0, /* offset= */ 0,
/* encryptionData= */ null); /* cryptoData= */ null);
numBytesPendingMetadataOutput = 0; numBytesPendingMetadataOutput = 0;
} }

6
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java
View File

@ -117,11 +117,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
long timeUs = toSampleUs(startTimeOffsetUs, timestamp, firstReceivedTimestamp); long timeUs = toSampleUs(startTimeOffsetUs, timestamp, firstReceivedTimestamp);
trackOutput.sampleMetadata( trackOutput.sampleMetadata(
timeUs, timeUs, bufferFlags, fragmentedSampleSizeBytes, /* offset= */ 0, /* cryptoData= */ null);
bufferFlags,
fragmentedSampleSizeBytes,
/* offset= */ 0,
/* encryptionData= */ null);
fragmentedSampleSizeBytes = 0; fragmentedSampleSizeBytes = 0;
} }