From d9fd85aa6343285612af1047e5bebb090c1a2a11 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 30 Dec 2021 16:10:35 +0000
Subject: [PATCH] Parse CryptoInfo from simpleTag and set it into DrmInitData.

PiperOrigin-RevId: 418960700
---
 .../media3/extractor/mkv/MatroskaExtractor.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index bb420977ea..8ae149a5b2 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -1327,7 +1327,12 @@ public class MatroskaExtractor implements Extractor {
     }
   }
 
-  private Track getCurrentTrack(int currentElementId) throws ParserException {
+  /**
+   * Returns the track corresponding to the current TrackEntry element.
+   *
+   * @throws ParserException if the element id is not in a TrackEntry.
+   */
+  protected Track getCurrentTrack(int currentElementId) throws ParserException {
     assertInTrackEntry(currentElementId);
     return currentTrack;
   }
@@ -1902,7 +1907,8 @@ public class MatroskaExtractor implements Extractor {
     }
   }
 
-  private static final class Track {
+  /** Holds data corresponding to a single track. */
+  protected static final class Track {
 
     private static final int DISPLAY_UNIT_PIXELS = 0;
     private static final int MAX_CHROMATICITY = 50_000; // Defined in CTA-861.3.