diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java index 80c64bc9bd..2cf2671aba 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java @@ -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); diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java index d3f9b3880d..5b50298df0 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java @@ -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(); diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java index a90ec1307c..65b662198f 100644 --- a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java +++ b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Libgav1VideoRenderer.java @@ -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; diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java index edd2a060d2..6552c4da08 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java @@ -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); } diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java index ee09838b0a..0b9612df95 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java @@ -137,8 +137,7 @@ public final class DrmInitData implements Comparator, 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; diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java index 5d454e84ac..c8aa9bd9ad 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java @@ -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; diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java index 0cdd2e038e..c5f0542795 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java @@ -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(); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index dcae3a24ff..990573bc91 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -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(); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java index d9a060fe2d..c3c04b51e4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloadIndex.java @@ -397,7 +397,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex { } @VisibleForTesting - /* package*/ static String encodeStreamKeys(List streamKeys) { + /* package */ static String encodeStreamKeys(List streamKeys) { StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < streamKeys.size(); i++) { StreamKey streamKey = streamKeys.get(i); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java index 8aec101e6d..1d36a4c618 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java @@ -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(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 25ce2a587c..add4783648 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -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; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java index 8fb6695a53..c3ebb12cfb 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java @@ -1002,8 +1002,8 @@ public final class AnalyticsCollectorTest { AtomicReference 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); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java index f64d109553..034d9712ce 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java @@ -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, diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java index 8c71ee8dac..f34ab81e0f 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java @@ -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(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java index 482c95bfd2..9fea31b5d5 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java @@ -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 = diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java index a6c42f9754..4ed8fc1ee3 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java @@ -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); }; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index b8877228c6..e5b29b6a85 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -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); }