From 28030b6c7eba2d3c7578db24761bee26c6b4f829 Mon Sep 17 00:00:00 2001 From: hoangtc Date: Thu, 29 Jun 2017 10:33:14 -0700 Subject: [PATCH] Temp workaround for [Internal: b/63092960] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160543009 --- .../exoplayer2/extractor/mp4/AtomParsers.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index f63010924c..80422c15e6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -681,9 +681,11 @@ import java.util.List; drmInitData = drmInitData.copyWithSchemeType(schemeType); } parent.setPosition(childPosition); - } else { - drmInitData = null; } +// TODO: Uncomment the following part when b/63092960 is fixed. +// else { +// drmInitData = null; +// } List initializationData = null; String mimeType = null; @@ -857,9 +859,11 @@ import java.util.List; drmInitData = drmInitData.copyWithSchemeType(schemeType); } parent.setPosition(childPosition); - } else { - drmInitData = null; } +// TODO: Uncomment the following part when b/63092960 is fixed. +// else { +// drmInitData = null; +// } // If the atom type determines a MIME type, set it immediately. String mimeType = null;