From bb9b3fd45e5a05ac46602d3a317cbeeaa22c27a8 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Mon, 27 Jan 2020 18:30:54 +0000 Subject: [PATCH] Fix some typos PiperOrigin-RevId: 291750515 --- .../com/google/android/exoplayer2/ext/av1/Gav1Decoder.java | 6 +++--- .../com/google/android/exoplayer2/audio/MpegAudioUtil.java | 6 +++--- .../com/google/android/exoplayer2/text/ssa/SsaDecoder.java | 4 ++-- .../exoplayer2/trackselection/MappingTrackSelectorTest.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java index 687ac47f2a..d47055b4fe 100644 --- a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java +++ b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java @@ -203,7 +203,7 @@ import java.nio.ByteBuffer; * @param context Decoder context. * @param surface Output surface. * @param outputBuffer Output buffer with the decoded frame. - * @return {@link #GAV1_OK} if successful, {@link #GAV1_ERROR} if an error occured. + * @return {@link #GAV1_OK} if successful, {@link #GAV1_ERROR} if an error occurred. */ private native int gav1RenderFrame( long context, Surface surface, VideoDecoderOutputBuffer outputBuffer); @@ -225,10 +225,10 @@ import java.nio.ByteBuffer; private native String gav1GetErrorMessage(long context); /** - * Returns whether an error occured. + * Returns whether an error occurred. * * @param context Decoder context. - * @return {@link #GAV1_OK} if there was no error, {@link #GAV1_ERROR} if an error occured. + * @return {@link #GAV1_OK} if there was no error, {@link #GAV1_ERROR} if an error occurred. */ private native int gav1CheckError(long context); } diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java index 36a5a8d6df..6c72a16e06 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java @@ -41,9 +41,9 @@ public final class MpegAudioUtil { public int samplesPerFrame; /** - * Populates the fields in this instance to reflect the the MPEG audio header in {@code - * headerData}, returning whether the header was valid. If false, the values of the fields in - * this instance will not be updated. + * Populates the fields in this instance to reflect the MPEG audio header in {@code headerData}, + * returning whether the header was valid. If false, the values of the fields in this instance + * will not be updated. * * @param headerData Header data to parse. * @return True if the fields were populated. False otherwise, indicating that {@code diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java index eef9d2eec1..b963b60479 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java @@ -139,7 +139,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { * starts with {@code [} (i.e. the title of the next section). * * @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition() position} - * set to the beginning of of the first line after {@code [Script Info]}. + * set to the beginning of the first line after {@code [Script Info]}. */ private void parseScriptInfo(ParsableByteArray data) { @Nullable String currentLine; @@ -175,7 +175,7 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { * starts with {@code [} (i.e. the title of the next section). * * @param data A {@link ParsableByteArray} with {@link ParsableByteArray#getPosition()} pointing - * at the beginning of of the first line after {@code [V4+ Styles]}. + * at the beginning of the first line after {@code [V4+ Styles]}. */ private static Map parseStyles(ParsableByteArray data) { Map styles = new LinkedHashMap<>(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java index ca6cae34b5..59ed9e8eac 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java @@ -89,7 +89,7 @@ public final class MappingTrackSelectorTest { } @Test - public void selectTracks_audioAndVideo_sameOrderAsRenderers_mappedToCorectRenderer() + public void selectTracks_audioAndVideo_sameOrderAsRenderers_mappedToCorrectRenderer() throws ExoPlaybackException { FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(); RendererCapabilities[] rendererCapabilities = @@ -103,7 +103,7 @@ public final class MappingTrackSelectorTest { } @Test - public void selectTracks_audioAndVideo_reverseOrderToRenderers_mappedToCorectRenderer() + public void selectTracks_audioAndVideo_reverseOrderToRenderers_mappedToCorrectRenderer() throws ExoPlaybackException { FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(); TrackGroupArray trackGroups = new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP);