diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
index 715489ccde..23cb9f3bbd 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
@@ -286,7 +286,7 @@ public final class FlacExtractor implements Extractor {
     sampleData.setPosition(0);
     output.sampleData(sampleData, size);
     output.sampleMetadata(
-        timeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* encryptionData= */ null);
+        timeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* cryptoData= */ null);
   }
 
   /** A {@link SeekMap} implementation using a SeekTable within the Flac stream. */
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java b/library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
index 883b68f603..6b217531dd 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java
@@ -1800,7 +1800,7 @@ public final class MediaItem implements Bundleable {
     return new MediaItem(
         mediaId,
         clippingConfiguration,
-        /* playbackProperties= */ null,
+        /* localConfiguration= */ null,
         liveConfiguration,
         mediaMetadata);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index b17e3cc131..4d3cb5b49b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -1069,7 +1069,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       TrackOutput icyTrackOutput = Assertions.checkNotNull(this.icyTrackOutput);
       icyTrackOutput.sampleData(metadata, length);
       icyTrackOutput.sampleMetadata(
-          timeUs, C.BUFFER_FLAG_KEY_FRAME, length, /* offset= */ 0, /* encryptionData= */ null);
+          timeUs, C.BUFFER_FLAG_KEY_FRAME, length, /* offset= */ 0, /* cryptoData= */ null);
       seenIcyMetadata = true;
     }
 
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
index 2ba8b0d599..b368874f56 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
@@ -317,7 +317,7 @@ public final class AmrExtractor implements Extractor {
         C.BUFFER_FLAG_KEY_FRAME,
         currentSampleSize,
         /* offset= */ 0,
-        /* encryptionData= */ null);
+        /* cryptoData= */ null);
     currentSampleTimeUs += SAMPLE_TIME_PER_FRAME_US;
     return RESULT_CONTINUE;
   }
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
index 3c870616fd..01de74f9a8 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java
@@ -414,6 +414,6 @@ public final class FlacExtractor implements Extractor {
             C.BUFFER_FLAG_KEY_FRAME,
             currentFrameBytesWritten,
             /* offset= */ 0,
-            /* encryptionData= */ null);
+            /* cryptoData= */ null);
   }
 }
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H263Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H263Reader.java
index 39660c106e..bdbf4db639 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H263Reader.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H263Reader.java
@@ -473,7 +473,7 @@ public final class H263Reader implements ElementaryStreamReader {
         int size = (int) (position - samplePosition);
         @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
         output.sampleMetadata(
-            sampleTimeUs, flags, size, bytesWrittenPastPosition, /* encryptionData= */ null);
+            sampleTimeUs, flags, size, bytesWrittenPastPosition, /* cryptoData= */ null);
       }
       // Start a new sample, unless this is a 'group of video object plane' in which case we
       // include the data at the start of a 'video object plane' coming next.
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
index 69d10f16a1..141512096b 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
@@ -367,7 +367,7 @@ public final class WavExtractor implements Extractor {
         int size = pendingFrames * bytesPerFrame;
         int offset = pendingOutputBytes - size;
         trackOutput.sampleMetadata(
-            timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null);
+            timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null);
         outputFrameCount += pendingFrames;
         pendingOutputBytes = offset;
       }
@@ -546,7 +546,7 @@ public final class WavExtractor implements Extractor {
       int size = numOutputFramesToBytes(sampleFrames);
       int offset = pendingOutputBytes - size;
       trackOutput.sampleMetadata(
-          timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* encryptionData= */ null);
+          timeUs, C.BUFFER_FLAG_KEY_FRAME, size, offset, /* cryptoData= */ null);
       outputFrameCount += sampleFrames;
       pendingOutputBytes -= size;
     }
diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java
index ec747fa1e2..1b8c338c98 100644
--- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java
+++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAacReader.java
@@ -151,7 +151,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
   private static void outputSampleMetadata(TrackOutput trackOutput, long sampleTimeUs, int size) {
     trackOutput.sampleMetadata(
-        sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* encryptionData= */ null);
+        sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, size, /* offset= */ 0, /* cryptoData= */ null);
   }
 
   /** Returns the correct sample time from RTP timestamp, accounting for the AAC sampling rate. */
diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java
index 33ab218a53..7069f2e975 100644
--- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java
+++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpAc3Reader.java
@@ -138,7 +138,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
             /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
             /* size= */ frameSize,
             /* offset= */ 0,
-            /* encryptionData= */ null);
+            /* cryptoData= */ null);
   }
 
   private void processMultiFramePacket(ParsableByteArray data, int numOfFrames, long sampleTimeUs) {
@@ -157,7 +157,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
               /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
               /* size= */ frameInfo.frameSize,
               /* offset= */ 0,
-              /* encryptionData= */ null);
+              /* cryptoData= */ null);
 
       sampleTimeUs += (frameInfo.sampleCount / frameInfo.sampleRate) * C.MICROS_PER_SECOND;
       // Advance the position by the number of bytes read.
@@ -203,7 +203,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
             /* flags= */ C.BUFFER_FLAG_KEY_FRAME,
             /* size= */ numBytesPendingMetadataOutput,
             /* offset= */ 0,
-            /* encryptionData= */ null);
+            /* cryptoData= */ null);
     numBytesPendingMetadataOutput = 0;
   }
 
diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java
index c98f678c39..e29e081918 100644
--- a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java
+++ b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/reader/RtpH264Reader.java
@@ -117,11 +117,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
 
       long timeUs = toSampleUs(startTimeOffsetUs, timestamp, firstReceivedTimestamp);
       trackOutput.sampleMetadata(
-          timeUs,
-          bufferFlags,
-          fragmentedSampleSizeBytes,
-          /* offset= */ 0,
-          /* encryptionData= */ null);
+          timeUs, bufferFlags, fragmentedSampleSizeBytes, /* offset= */ 0, /* cryptoData= */ null);
       fragmentedSampleSizeBytes = 0;
     }