diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
index c0596c0550..0d126ff27f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/AsynchronousMediaCodecAdapter.java
@@ -43,7 +43,7 @@ import com.google.android.exoplayer2.util.Assertions;
   /**
    * Create a new {@code AsynchronousMediaCodecAdapter}.
    *
-   * @param codec the {@link MediaCodec} to wrap.
+   * @param codec The {@link MediaCodec} to wrap.
    */
   public AsynchronousMediaCodecAdapter(MediaCodec codec) {
     this(codec, Assertions.checkNotNull(Looper.myLooper()));
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
index 9d86f37736..c984443041 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecAdapter.java
@@ -35,7 +35,7 @@ import android.media.MediaFormat;
    * Returns the next available input buffer index from the underlying {@link MediaCodec} or {@link
    * MediaCodec#INFO_TRY_AGAIN_LATER} if no such buffer exists.
    *
-   * @throws {@link IllegalStateException} if the underlying {@link MediaCodec} raised an error.
+   * @throws IllegalStateException If the underlying {@link MediaCodec} raised an error.
    */
   int dequeueInputBufferIndex();
 
@@ -46,7 +46,7 @@ import android.media.MediaFormat;
    * the format. If there is no available output, this method will return {@link
    * MediaCodec#INFO_TRY_AGAIN_LATER}.
    *
-   * @throws {@link IllegalStateException} if the underlying {@link MediaCodec} raised an error.
+   * @throws IllegalStateException If the underlying {@link MediaCodec} raised an error.
    */
   int dequeueOutputBufferIndex(MediaCodec.BufferInfo bufferInfo);
 
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 9f6ff1212c..953ffbe546 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
@@ -406,9 +406,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   private boolean waitingForFirstSyncSample;
   private boolean waitingForFirstSampleInFormat;
   private boolean pendingOutputEndOfStream;
-
-  private @MediaCodecOperationMode int mediaCodecOperationMode;
-
+  @MediaCodecOperationMode private int mediaCodecOperationMode;
   protected DecoderCounters decoderCounters;
 
   /**
@@ -473,7 +471,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    * <p>This method is experimental, and will be renamed or removed in a future release. It should
    * only be called before the renderer is used.
    *
-   * @param mode the mode of the MediaCodec. The supported modes are:
+   * @param mode The mode of the MediaCodec. The supported modes are:
    *     <ul>
    *       <li>{@link MediaCodecOperationMode#SYNCHRONOUS}: The {@link MediaCodec} will operate in
    *           synchronous mode.