sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temp workaround for [Internal: b/63092960]

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160543009
This commit is contained in:
hoangtc 2017-06-29 10:33:14 -07:00 committed by Oliver Woodman
parent 84f4fe5cf9
commit 28030b6c7e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file

@ -681,9 +681,11 @@ import java.util.List;
drmInitData = drmInitData.copyWithSchemeType(schemeType); drmInitData = drmInitData.copyWithSchemeType(schemeType);
} }
parent.setPosition(childPosition); parent.setPosition(childPosition);
} else {
drmInitData = null;
} }
// TODO: Uncomment the following part when b/63092960 is fixed.
// else {
// drmInitData = null;
// }
List<byte[]> initializationData = null; List<byte[]> initializationData = null;
String mimeType = null; String mimeType = null;
@ -857,9 +859,11 @@ import java.util.List;
drmInitData = drmInitData.copyWithSchemeType(schemeType); drmInitData = drmInitData.copyWithSchemeType(schemeType);
} }
parent.setPosition(childPosition); 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. // If the atom type determines a MIME type, set it immediately.
String mimeType = null; String mimeType = null;