diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
index f1a9ac731a..a203d164dd 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
@@ -120,11 +120,11 @@ public interface TrackOutput {
    *       encryption data also contains:
    *       <ul>
    *         <li>(2 bytes) {@code subsample_encryption_data_length}.
-   *         <li>({@code subsample_encryption_data_length} bytes) Subsample encryption data
-   *             (repeated {@code subsample_encryption_data_length / 6} times:
+   *         <li>({@code subsample_encryption_data_length * 6} bytes) Subsample encryption data
+   *             (repeated {@code subsample_encryption_data_length} times:
    *             <ul>
-   *               <li>(3 bytes) Size of a clear section in sample.
-   *               <li>(3 bytes) Size of an encryption section in sample.
+   *               <li>(2 bytes) Size of a clear section in sample.
+   *               <li>(4 bytes) Size of an encryption section in sample.
    *             </ul>
    *       </ul>
    * </ul>
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index d20da440dc..ae543c1642 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -1630,7 +1630,7 @@ public class FragmentedMp4Extractor implements Extractor {
         // clearDataSize = clearHeaderSize (unsigned short)
         scratch.data[2] = (byte) ((clearHeaderSize >> 8) & 0xFF);
         scratch.data[3] = (byte) (clearHeaderSize & 0xFF);
-        // encryptedDataSize = sampleSize (unsigned short)
+        // encryptedDataSize = sampleSize (unsigned int)
         scratch.data[4] = (byte) ((sampleSize >> 24) & 0xFF);
         scratch.data[5] = (byte) ((sampleSize >> 16) & 0xFF);
         scratch.data[6] = (byte) ((sampleSize >> 8) & 0xFF);