Skip to content

Commit

Permalink
Temp workaround for [Internal: b/63092960]
Browse files Browse the repository at this point in the history
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=160543009
  • Loading branch information
botaydotcom authored and ojw28 committed Jun 30, 2017
1 parent 84f4fe5 commit 28030b6
Showing 1 changed file with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,11 @@ private static void parseVideoSampleEntry(ParsableByteArray parent, int atomType
drmInitData = drmInitData.copyWithSchemeType(schemeType);
}
parent.setPosition(childPosition);
} else {
drmInitData = null;
}
// TODO: Uncomment the following part when b/63092960 is fixed.
// else {
// drmInitData = null;
// }

List<byte[]> initializationData = null;
String mimeType = null;
Expand Down Expand Up @@ -857,9 +859,11 @@ private static void parseAudioSampleEntry(ParsableByteArray parent, int atomType
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;
Expand Down

0 comments on commit 28030b6

Please sign in to comment.