From c06fa144e1acd88100df7d2a7525ade294fa7bbb Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 6 Jul 2020 20:12:24 +0100 Subject: [PATCH] Remove some sanity occurrences in Java files Remove occurrences in comments and private fields. ISSUE: #7565 PiperOrigin-RevId: 319828820 --- .../src/test/java/com/google/android/exoplayer2/CTest.java | 4 ++-- .../com/google/android/exoplayer2/MediaPeriodHolder.java | 2 +- .../android/exoplayer2/audio/AudioTrackPositionTracker.java | 6 +++--- .../google/android/exoplayer2/audio/DefaultAudioSink.java | 2 +- .../google/android/exoplayer2/drm/DefaultDrmSession.java | 4 ++-- .../android/exoplayer2/text/subrip/SubripDecoder.java | 2 +- .../java/com/google/android/exoplayer2/util/SntpClient.java | 2 +- .../exoplayer2/video/spherical/ProjectionDecoder.java | 2 +- .../exoplayer2/upstream/cache/CacheDataSourceTest2.java | 4 ++-- .../google/android/exoplayer2/extractor/ExtractorTest.java | 4 ++-- .../android/exoplayer2/extractor/mp4/MetadataUtilTest.java | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/library/common/src/test/java/com/google/android/exoplayer2/CTest.java b/library/common/src/test/java/com/google/android/exoplayer2/CTest.java index ac5edc6f6b..de39888b41 100644 --- a/library/common/src/test/java/com/google/android/exoplayer2/CTest.java +++ b/library/common/src/test/java/com/google/android/exoplayer2/CTest.java @@ -31,7 +31,7 @@ public class CTest { @SuppressLint("InlinedApi") @Test public void bufferFlagConstants_equalToMediaCodecConstants() { - // Sanity check that constant values match those defined by the platform. + // Check that constant values match those defined by the platform. assertThat(C.BUFFER_FLAG_KEY_FRAME).isEqualTo(MediaCodec.BUFFER_FLAG_KEY_FRAME); assertThat(C.BUFFER_FLAG_END_OF_STREAM).isEqualTo(MediaCodec.BUFFER_FLAG_END_OF_STREAM); assertThat(C.CRYPTO_MODE_AES_CTR).isEqualTo(MediaCodec.CRYPTO_MODE_AES_CTR); @@ -40,7 +40,7 @@ public class CTest { @SuppressLint("InlinedApi") @Test public void encodingConstants_equalToAudioFormatConstants() { - // Sanity check that encoding constant values match those defined by the platform. + // Check that encoding constant values match those defined by the platform. assertThat(C.ENCODING_PCM_16BIT).isEqualTo(AudioFormat.ENCODING_PCM_16BIT); assertThat(C.ENCODING_MP3).isEqualTo(AudioFormat.ENCODING_MP3); assertThat(C.ENCODING_PCM_FLOAT).isEqualTo(AudioFormat.ENCODING_PCM_FLOAT); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java index 3c7a41439a..0b92eab8b1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java @@ -297,7 +297,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; positionUs); associateNoSampleRenderersWithEmptySampleStream(sampleStreams); - // Update whether we have enabled tracks and sanity check the expected streams are non-null. + // Update whether we have enabled tracks and check that the expected streams are non-null. hasEnabledTracks = false; for (int i = 0; i < sampleStreams.length; i++) { if (sampleStreams[i] != null) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java index ae2eb92044..dce173b7ac 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java @@ -435,7 +435,7 @@ import java.lang.reflect.Method; return; } - // Perform sanity checks on the timestamp and accept/reject it. + // Check the timestamp and accept/reject it. long audioTimestampSystemTimeUs = audioTimestampPoller.getTimestampSystemTimeUs(); long audioTimestampPositionFrames = audioTimestampPoller.getTimestampPositionFrames(); if (Math.abs(audioTimestampSystemTimeUs - systemTimeUs) > MAX_AUDIO_TIMESTAMP_OFFSET_US) { @@ -469,9 +469,9 @@ import java.lang.reflect.Method; castNonNull((Integer) getLatencyMethod.invoke(Assertions.checkNotNull(audioTrack))) * 1000L - bufferSizeUs; - // Sanity check that the latency is non-negative. + // Check that the latency is non-negative. latencyUs = Math.max(latencyUs, 0); - // Sanity check that the latency isn't too large. + // Check that the latency isn't too large. if (latencyUs > MAX_LATENCY_US) { listener.onInvalidLatency(latencyUs); latencyUs = 0; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java index 9beae27c89..d9b4c09f00 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java @@ -708,7 +708,7 @@ public final class DefaultAudioSink implements AudioSink { afterDrainParameters = null; } - // Sanity check that presentationTimeUs is consistent with the expected value. + // Check that presentationTimeUs is consistent with the expected value. long expectedPresentationTimeUs = startMediaTimeUs + configuration.inputFramesToDurationUs( diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java index 5a51638c17..4139db05ad 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java @@ -421,8 +421,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; case DefaultDrmSessionManager.MODE_RELEASE: Assertions.checkNotNull(offlineLicenseKeySetId); Assertions.checkNotNull(this.sessionId); - // It's not necessary to restore the key (and open a session to do that) before releasing it - // but this serves as a good sanity/fast-failure check. + // It's not necessary to restore the key before releasing it but this serves as a good + // fast-failure check. if (restoreKeys()) { postKeyRequest(offlineLicenseKeySetId, ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java index 6e25dfc52a..6e94b9782a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java @@ -84,7 +84,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { continue; } - // Parse the index line as a sanity check. + // Parse and check the index line. try { Integer.parseInt(currentLine); } catch (NumberFormatException e) { diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java b/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java index fa2edf253d..19159ede6e 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/SntpClient.java @@ -160,7 +160,7 @@ public final class SntpClient { final long receiveTime = readTimestamp(buffer, RECEIVE_TIME_OFFSET); final long transmitTime = readTimestamp(buffer, TRANSMIT_TIME_OFFSET); - // Do sanity check according to RFC. + // Check server reply validity according to RFC. checkValidServerReply(leap, mode, stratum, transmitTime); // receiveTime = originateTime + transit + skew diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java index c5a1a76895..0a75dfce59 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/ProjectionDecoder.java @@ -43,7 +43,7 @@ public final class ProjectionDecoder { private static final int TYPE_MESH = 0x6d657368; private static final int TYPE_PROJ = 0x70726f6a; - // Sanity limits to prevent a bad file from creating an OOM situation. We don't expect a mesh to + // Limits to prevent a bad file from creating an OOM situation. We don't expect a mesh to // exceed these limits. private static final int MAX_COORDINATE_COUNT = 10_000; private static final int MAX_VERTEX_COUNT = 32 * 1000; diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java index 8702e887f8..0a1f800983 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java @@ -179,13 +179,13 @@ public final class CacheDataSourceTest2 { null); // eventListener } - private static void emptyCache(Cache cache) throws CacheException { + private static void emptyCache(Cache cache) { for (String key : cache.getKeys()) { for (CacheSpan span : cache.getCachedSpans(key)) { cache.removeSpan(span); } } - // Sanity check that the cache really is empty now. + // Check that the cache really is empty now. assertThat(cache.getKeys().isEmpty()).isTrue(); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java index c95804c297..caf184a119 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java @@ -28,9 +28,9 @@ public final class ExtractorTest { @Test public void constants() { - // Sanity check that constant values match those defined by {@link C}. + // Check that constant values match those defined by {@link C}. assertThat(Extractor.RESULT_END_OF_INPUT).isEqualTo(C.RESULT_END_OF_INPUT); - // Sanity check that the other constant values don't overlap. + // Check that the other constant values don't overlap. assertThat(C.RESULT_END_OF_INPUT != Extractor.RESULT_CONTINUE).isTrue(); assertThat(C.RESULT_END_OF_INPUT != Extractor.RESULT_SEEK).isTrue(); } diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java index 2466c46d8a..70e483457a 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java @@ -27,7 +27,7 @@ public final class MetadataUtilTest { @Test public void standardGenre_length_matchesNumberOfId3Genres() { - // Sanity check that we haven't forgotten a genre in the list. + // Check that we haven't forgotten a genre in the list. assertThat(MetadataUtil.STANDARD_GENRES).hasLength(192); } }