From 1380655747b7364f06774dacd2dda5b1d577b812 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 30 Dec 2021 16:10:35 +0000 Subject: [PATCH] Parse CryptoInfo from simpleTag and set it into DrmInitData. PiperOrigin-RevId: 418960700 --- .../exoplayer2/extractor/mkv/MatroskaExtractor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index 3a0091e28a..e8876ca52c 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -1325,7 +1325,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; } @@ -1900,7 +1905,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.