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

Fix unexpected multiline comments

Browse Source 
#exofixit

PiperOrigin-RevId: 344517105
This commit is contained in:
andrewlewis 2020-11-27 12:42:27 +00:00 committed by Ian Baker
parent 6d01d40971
commit 4446e2637d
17 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
View File

@ -332,7 +332,7 @@ public class DownloadTracker {
/* titleId= */ R.string.exo_download_description,
mappedTrackInfo,
trackSelectorParameters,
/* allowAdaptiveSelections =*/ false,
/* allowAdaptiveSelections= */ false,
/* allowMultipleOverrides= */ true,
/* onClickListener= */ this,
/* onDismissListener= */ this);

2
demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
View File

@ -94,7 +94,7 @@ public final class TrackSelectionDialog extends DialogFragment {
/* titleId= */ R.string.track_selection_title,
mappedTrackInfo,
/* initialParameters = */ parameters,
/* allowAdaptiveSelections =*/ true,
/* allowAdaptiveSelections= */ true,
/* allowMultipleOverrides= */ false,
/* onClickListener= */ (dialog, which) -> {
DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();

5
extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java
View File

@ -45,7 +45,10 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer {
private static final String TAG = "Libgav1VideoRenderer";
private static final int DEFAULT_NUM_OF_INPUT_BUFFERS = 4;
private static final int DEFAULT_NUM_OF_OUTPUT_BUFFERS = 4;
/* Default size based on 720p resolution video compressed by a factor of two. */
/**
* Default input buffer size in bytes, based on 720p resolution video compressed by a factor of
* two.
*/
private static final int DEFAULT_INPUT_BUFFER_SIZE =
Util.ceilDivide(1280, 64) * Util.ceilDivide(720, 64) * (64 * 64 * 3 / 2) / 2;

4
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
View File

@ -46,8 +46,8 @@ import java.util.Arrays;
private ItemData() {
this(
/* durationUs= */ C.TIME_UNSET, /* defaultPositionUs */
C.TIME_UNSET,
/* durationUs= */ C.TIME_UNSET,
/* defaultPositionUs= */ C.TIME_UNSET,
/* isLive= */ false);
}

3
library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
View File

@ -137,8 +137,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
Arrays.sort(this.schemeDatas, this);
}
/* package */
DrmInitData(Parcel in) {
/* package */ DrmInitData(Parcel in) {
schemeType = in.readString();
schemeDatas = Util.castNonNull(in.createTypedArray(SchemeData.CREATOR));
schemeDataCount = schemeDatas.length;

3
library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java
View File

@ -45,8 +45,7 @@ public final class ChapterTocFrame extends Id3Frame {
this.subFrames = subFrames;
}
/* package */
ChapterTocFrame(Parcel in) {
/* package */ ChapterTocFrame(Parcel in) {
super(ID);
this.elementId = castNonNull(in.readString());
this.isRoot = in.readByte() != 0;

3
library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java
View File

@ -45,8 +45,7 @@ public final class MlltFrame extends Id3Frame {
this.millisecondsDeviations = millisecondsDeviations;
}
/* package */
MlltFrame(Parcel in) {
/* package */ MlltFrame(Parcel in) {
super(ID);
this.mpegFramesBetweenReference = in.readInt();
this.bytesBetweenReference = in.readInt();

2
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View File

@ -1756,7 +1756,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
processOutputMediaFormatChanged();
return true;
}
/* MediaCodec.INFO_TRY_AGAIN_LATER (-1) or unknown negative return value */
// MediaCodec.INFO_TRY_AGAIN_LATER (-1) or unknown negative return value.
if (codecNeedsEosPropagation
&& (inputStreamEnded || codecDrainState == DRAIN_STATE_WAIT_END_OF_STREAM)) {
processEndOfStream();

2
library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java
View File

@ -397,7 +397,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
}
@VisibleForTesting
/* package*/ static String encodeStreamKeys(List<StreamKey> streamKeys) {
/* package */ static String encodeStreamKeys(List<StreamKey> streamKeys) {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < streamKeys.size(); i++) {
StreamKey streamKey = streamKeys.get(i);

3
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View File

@ -1088,8 +1088,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
this.rendererDisabledFlags = rendererDisabledFlags;
}
/* package */
Parameters(Parcel in) {
/* package */ Parameters(Parcel in) {
super(in);
// Video
this.maxVideoWidth = in.readInt();

4
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View File

@ -3138,7 +3138,7 @@ public final class ExoPlayerTest {
Timeline timeline =
new FakeTimeline(
new TimelineWindowDefinition(
/* periodCount =*/ 2,
/* periodCount= */ 2,
/* id= */ new Object(),
/* isSeekable= */ true,
/* isDynamic= */ false,
@ -8760,7 +8760,7 @@ public final class ExoPlayerTest {
// Internal classes.
/* {@link FakeRenderer} that can sleep and be woken-up. */
/** {@link FakeRenderer} that can sleep and be woken-up. */
private static class FakeSleepRenderer extends FakeRenderer {
private static final long WAKEUP_DEADLINE_MS = 60 * C.MICROS_PER_SECOND;
private final AtomicBoolean sleepOnNextRender;

4
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
View File

@ -1002,8 +1002,8 @@ public final class AnalyticsCollectorTest {
AtomicReference<AdPlaybackState> adPlaybackState =
new AtomicReference<>(
FakeTimeline.createAdPlaybackState(
/* adsPerAdGroup= */ 1, /* adGroupTimesUs...= */
windowOffsetInFirstPeriodUs,
/* adsPerAdGroup= */ 1,
/* adGroupTimesUs...= */ windowOffsetInFirstPeriodUs,
windowOffsetInFirstPeriodUs + 5 * C.MICROS_PER_SECOND,
C.TIME_END_OF_SOURCE));
AtomicInteger playedAdCount = new AtomicInteger(0);

10
library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java
View File

@ -417,7 +417,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* id= */ 0,
/* isSeekable= */ true,
/* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(
/* adsId= */ new Object(),
/* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND,
@ -702,7 +702,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* id= */ 0,
/* isSeekable= */ true,
/* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(
/* adsId= */ new Object(), /* adGroupTimesUs=... */ C.TIME_END_OF_SOURCE)
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)));
@ -905,7 +905,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* id= */ 0,
/* isSeekable= */ true,
/* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(
/* adsId= */ new Object(), /* adGroupTimesUs=... */
0,
@ -987,7 +987,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* id= */ 0,
/* isSeekable= */ true,
/* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(
/* adsId= */ new Object(), /* adGroupTimesUs=... */
2 * C.MICROS_PER_SECOND,
@ -1039,7 +1039,7 @@ public final class DefaultPlaybackSessionManagerTest {
/* id= */ 0,
/* isSeekable= */ true,
/* isDynamic= */ false,
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
new AdPlaybackState(
/* adsId= */ new Object(), /* adGroupTimesUs=... */
0,

8
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
View File

@ -499,8 +499,8 @@ public final class ConcatenatingMediaSourceTest {
mediaSource.addMediaSources(
Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
mediaSource.moveMediaSource(
/* fromIndex */ 1, /* toIndex */
0,
/* currentIndex= */ 1,
/* newIndex= */ 0,
Util.createHandlerForCurrentLooper(),
runnableInvoked::countDown);
});
@ -624,8 +624,8 @@ public final class ConcatenatingMediaSourceTest {
testThread.runOnMainThread(
() ->
mediaSource.moveMediaSource(
/* fromIndex */ 1, /* toIndex */
0,
/* currentIndex= */ 1,
/* newIndex= */ 0,
Util.createHandlerForCurrentLooper(),
timelineGrabber));
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();

2
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java vendored
View File

@ -643,7 +643,7 @@ public class SimpleCacheTest {
.isEqualTo(10);
}
/* Tests https://github.com/google/ExoPlayer/issues/3260 case. */
// Regression test for https://github.com/google/ExoPlayer/issues/3260.
@Test
public void exceptionDuringIndexStore_doesNotPreventEviction() throws Exception {
CachedContentIndex contentIndex =

2
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
View File

@ -90,7 +90,7 @@ public final class HlsMediaPeriodTest {
.withParameters(/* windowIndex= */ 0, mediaPeriodId, /* mediaTimeOffsetMs= */ 0),
mock(Allocator.class),
mock(CompositeSequenceableLoaderFactory.class),
/* allowChunklessPreparation =*/ true,
/* allowChunklessPreparation= */ true,
HlsMediaSource.METADATA_TYPE_ID3,
/* useSessionKeys= */ false);
};

4
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
View File

@ -571,7 +571,7 @@ public class PlayerNotificationManager {
notificationId,
mediaDescriptionAdapter,
notificationListener,
/* customActionReceiver*/ null);
/* customActionReceiver= */ null);
}
/**
@ -599,7 +599,7 @@ public class PlayerNotificationManager {
channelId,
notificationId,
mediaDescriptionAdapter,
/* notificationListener */ null,
/* notificationListener= */ null,
customActionReceiver);
}