Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the output CryptoInfo.iv non-null" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-24 20:04:35 +00:00
committed by Android (Google) Code Review
parent fe1d660cce b52102743a
commit da8620b7f7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -880,6 +880,7 @@ public final class MediaParser {
private static final String TS_MODE_MULTI_PMT = "multi_pmt";
private static final String TS_MODE_HLS = "hls";
private static final int BYTES_PER_SUBSAMPLE_ENCRYPTION_ENTRY = 6;
private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
@IntDef(
value = {
@@ -1674,6 +1675,9 @@ public final class MediaParser {
if (cryptoData != mLastReceivedCryptoData) {
mLastOutputCryptoInfo =
createNewCryptoInfoAndPopulateWithCryptoData(cryptoData);
// We are using in-band crypto info, so the IV will be ignored. But we prevent
// it from being null because toString assumes it non-null.
mLastOutputCryptoInfo.iv = EMPTY_BYTE_ARRAY;
}
} else /* We must populate the full CryptoInfo. */ {
// CryptoInfo.pattern is not accessible to the user, so the user needs to feed