loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DashManifestParser: Move schemeType up to DrmInitData

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167171407
This commit is contained in:
olly 2017-04-07 12:10:08 +01:00 committed by Oliver Woodman
parent daafbb1f1c
commit ca2bfbc56e
10 changed files with 81 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
View File

@ -31,15 +31,15 @@ import junit.framework.TestCase;
*/ */
public class DrmInitDataTest extends TestCase { public class DrmInitDataTest extends TestCase {
private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, "cbc1", VIDEO_MP4, private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
TestUtil.buildTestData(128, 1 /* data seed */)); TestUtil.buildTestData(128, 1 /* data seed */));
private static final SchemeData DATA_2 = new SchemeData(PLAYREADY_UUID, null, VIDEO_MP4, private static final SchemeData DATA_2 = new SchemeData(PLAYREADY_UUID, VIDEO_MP4,
TestUtil.buildTestData(128, 2 /* data seed */)); TestUtil.buildTestData(128, 2 /* data seed */));
private static final SchemeData DATA_1B = new SchemeData(WIDEVINE_UUID, "cbc1", VIDEO_MP4, private static final SchemeData DATA_1B = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
TestUtil.buildTestData(128, 1 /* data seed */)); TestUtil.buildTestData(128, 1 /* data seed */));
private static final SchemeData DATA_2B = new SchemeData(PLAYREADY_UUID, null, VIDEO_MP4, private static final SchemeData DATA_2B = new SchemeData(PLAYREADY_UUID, VIDEO_MP4,
TestUtil.buildTestData(128, 2 /* data seed */)); TestUtil.buildTestData(128, 2 /* data seed */));
private static final SchemeData DATA_UNIVERSAL = new SchemeData(C.UUID_NIL, null, VIDEO_MP4, private static final SchemeData DATA_UNIVERSAL = new SchemeData(C.UUID_NIL, VIDEO_MP4,
TestUtil.buildTestData(128, 3 /* data seed */)); TestUtil.buildTestData(128, 3 /* data seed */));
public void testParcelable() { public void testParcelable() {

2
library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
View File

@ -153,7 +153,7 @@ public class OfflineLicenseHelperTest extends InstrumentationTestCase {
} }
private static DrmInitData newDrmInitData() { private static DrmInitData newDrmInitData() {
return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "cenc", "mimeType", return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "mimeType",
new byte[] {1, 4, 7, 0, 3, 6})); new byte[] {1, 4, 7, 0, 3, 6}));
} }

2
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
View File

@ -278,7 +278,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
// No data for this manager's scheme. // No data for this manager's scheme.
return false; return false;
} }
String schemeType = schemeData.type; String schemeType = drmInitData.schemeType;
if (schemeType == null || C.CENC_TYPE_cenc.equals(schemeType)) { if (schemeType == null || C.CENC_TYPE_cenc.equals(schemeType)) {
// If there is no scheme information, assume patternless AES-CTR. // If there is no scheme information, assume patternless AES-CTR.
return true; return true;

77
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java
View File

@ -37,6 +37,11 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
// Lazily initialized hashcode. // Lazily initialized hashcode.
private int hashCode; private int hashCode;
/**
* The protection scheme type, or null if not applicable or unknown.
*/
@Nullable public final String schemeType;
/** /**
* Number of {@link SchemeData}s. * Number of {@link SchemeData}s.
*/ */
@ -46,17 +51,19 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes. * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/ */
public DrmInitData(List<SchemeData> schemeDatas) { public DrmInitData(List<SchemeData> schemeDatas) {
this(false, schemeDatas.toArray(new SchemeData[schemeDatas.size()])); this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
} }
/** /**
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes. * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/ */
public DrmInitData(SchemeData... schemeDatas) { public DrmInitData(SchemeData... schemeDatas) {
this(true, schemeDatas); this(null, true, schemeDatas);
} }
private DrmInitData(boolean cloneSchemeDatas, SchemeData... schemeDatas) { private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
SchemeData... schemeDatas) {
this.schemeType = schemeType;
if (cloneSchemeDatas) { if (cloneSchemeDatas) {
schemeDatas = schemeDatas.clone(); schemeDatas = schemeDatas.clone();
} }
@ -74,6 +81,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
} }
/* package */ DrmInitData(Parcel in) { /* package */ DrmInitData(Parcel in) {
schemeType = in.readString();
schemeDatas = in.createTypedArray(SchemeData.CREATOR); schemeDatas = in.createTypedArray(SchemeData.CREATOR);
schemeDataCount = schemeDatas.length; schemeDataCount = schemeDatas.length;
} }
@ -104,36 +112,24 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
} }
/** /**
* Returns a copy of the {@link DrmInitData} instance whose {@link SchemeData}s have been updated * Returns a copy with the specified protection scheme type.
* to have the specified scheme type.
* *
* @param schemeType A protection scheme type. May be null. * @param schemeType A protection scheme type. May be null.
* @return A copy of the {@link DrmInitData} instance whose {@link SchemeData}s have been updated * @return A copy with the specified protection scheme type.
* to have the specified scheme type.
*/ */
public DrmInitData copyWithSchemeType(@Nullable String schemeType) { public DrmInitData copyWithSchemeType(@Nullable String schemeType) {
boolean isCopyRequired = false; if (Util.areEqual(this.schemeType, schemeType)) {
for (SchemeData schemeData : schemeDatas) {
if (!Util.areEqual(schemeData.type, schemeType)) {
isCopyRequired = true;
break;
}
}
if (isCopyRequired) {
SchemeData[] schemeDatas = new SchemeData[this.schemeDatas.length];
for (int i = 0; i < schemeDatas.length; i++) {
schemeDatas[i] = this.schemeDatas[i].copyWithSchemeType(schemeType);
}
return new DrmInitData(schemeDatas);
} else {
return this; return this;
} }
return new DrmInitData(schemeType, false, schemeDatas);
} }
@Override @Override
public int hashCode() { public int hashCode() {
if (hashCode == 0) { if (hashCode == 0) {
hashCode = Arrays.hashCode(schemeDatas); int result = (schemeType == null ? 0 : schemeType.hashCode());
result = 31 * result + Arrays.hashCode(schemeDatas);
hashCode = result;
} }
return hashCode; return hashCode;
} }
@ -146,7 +142,9 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
if (obj == null || getClass() != obj.getClass()) { if (obj == null || getClass() != obj.getClass()) {
return false; return false;
} }
return Arrays.equals(schemeDatas, ((DrmInitData) obj).schemeDatas); DrmInitData other = (DrmInitData) obj;
return Util.areEqual(schemeType, other.schemeType)
&& Arrays.equals(schemeDatas, other.schemeDatas);
} }
@Override @Override
@ -164,6 +162,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeString(schemeType);
dest.writeTypedArray(schemeDatas, 0); dest.writeTypedArray(schemeDatas, 0);
} }
@ -195,10 +194,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
* applies to all schemes). * applies to all schemes).
*/ */
private final UUID uuid; private final UUID uuid;
/**
* The protection scheme type, or null if not applicable or unknown.
*/
@Nullable public final String type;
/** /**
* The mimeType of {@link #data}. * The mimeType of {@link #data}.
*/ */
@ -215,26 +210,22 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
/** /**
* @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
* universal (i.e. applies to all schemes). * universal (i.e. applies to all schemes).
* @param type The type of the protection scheme, or null if not applicable or unknown.
* @param mimeType The mimeType of the initialization data. * @param mimeType The mimeType of the initialization data.
* @param data The initialization data. * @param data The initialization data.
*/ */
public SchemeData(UUID uuid, @Nullable String type, String mimeType, byte[] data) { public SchemeData(UUID uuid, String mimeType, byte[] data) {
this(uuid, type, mimeType, data, false); this(uuid, mimeType, data, false);
} }
/** /**
* @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
* universal (i.e. applies to all schemes). * universal (i.e. applies to all schemes).
* @param type The type of the protection scheme, or null if not applicable or unknown.
* @param mimeType The mimeType of the initialization data. * @param mimeType The mimeType of the initialization data.
* @param data The initialization data. * @param data The initialization data.
* @param requiresSecureDecryption Whether secure decryption is required. * @param requiresSecureDecryption Whether secure decryption is required.
*/ */
public SchemeData(UUID uuid, @Nullable String type, String mimeType, byte[] data, public SchemeData(UUID uuid, String mimeType, byte[] data, boolean requiresSecureDecryption) {
boolean requiresSecureDecryption) {
this.uuid = Assertions.checkNotNull(uuid); this.uuid = Assertions.checkNotNull(uuid);
this.type = type;
this.mimeType = Assertions.checkNotNull(mimeType); this.mimeType = Assertions.checkNotNull(mimeType);
this.data = Assertions.checkNotNull(data); this.data = Assertions.checkNotNull(data);
this.requiresSecureDecryption = requiresSecureDecryption; this.requiresSecureDecryption = requiresSecureDecryption;
@ -242,7 +233,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
/* package */ SchemeData(Parcel in) { /* package */ SchemeData(Parcel in) {
uuid = new UUID(in.readLong(), in.readLong()); uuid = new UUID(in.readLong(), in.readLong());
type = in.readString();
mimeType = in.readString(); mimeType = in.readString();
data = in.createByteArray(); data = in.createByteArray();
requiresSecureDecryption = in.readByte() != 0; requiresSecureDecryption = in.readByte() != 0;
@ -258,19 +248,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
return C.UUID_NIL.equals(uuid) || schemeUuid.equals(uuid); return C.UUID_NIL.equals(uuid) || schemeUuid.equals(uuid);
} }
/**
* Returns a copy of the {@link SchemeData} instance with the given scheme type.
*
* @param type A protection scheme type.
* @return A copy of the {@link SchemeData} instance with the given scheme type.
*/
public SchemeData copyWithSchemeType(String type) {
if (Util.areEqual(this.type, type)) {
return this;
}
return new SchemeData(uuid, type, mimeType, data, requiresSecureDecryption);
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (!(obj instanceof SchemeData)) { if (!(obj instanceof SchemeData)) {
@ -281,14 +258,13 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
} }
SchemeData other = (SchemeData) obj; SchemeData other = (SchemeData) obj;
return mimeType.equals(other.mimeType) && Util.areEqual(uuid, other.uuid) return mimeType.equals(other.mimeType) && Util.areEqual(uuid, other.uuid)
&& Util.areEqual(type, other.type) && Arrays.equals(data, other.data); && Arrays.equals(data, other.data);
} }
@Override @Override
public int hashCode() { public int hashCode() {
if (hashCode == 0) { if (hashCode == 0) {
int result = uuid.hashCode(); int result = uuid.hashCode();
result = 31 * result + (type == null ? 0 : type.hashCode());
result = 31 * result + mimeType.hashCode(); result = 31 * result + mimeType.hashCode();
result = 31 * result + Arrays.hashCode(data); result = 31 * result + Arrays.hashCode(data);
hashCode = result; hashCode = result;
@ -307,7 +283,6 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(uuid.getMostSignificantBits()); dest.writeLong(uuid.getMostSignificantBits());
dest.writeLong(uuid.getLeastSignificantBits()); dest.writeLong(uuid.getLeastSignificantBits());
dest.writeString(type);
dest.writeString(mimeType); dest.writeString(mimeType);
dest.writeByteArray(data); dest.writeByteArray(data);
dest.writeByte((byte) (requiresSecureDecryption ? 1 : 0)); dest.writeByte((byte) (requiresSecureDecryption ? 1 : 0));

2
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
View File

@ -628,7 +628,7 @@ public final class MatroskaExtractor implements Extractor {
if (currentTrack.cryptoData == null) { if (currentTrack.cryptoData == null) {
throw new ParserException("Encrypted Track found but ContentEncKeyID was not found"); throw new ParserException("Encrypted Track found but ContentEncKeyID was not found");
} }
currentTrack.drmInitData = new DrmInitData(new SchemeData(C.UUID_NIL, null, currentTrack.drmInitData = new DrmInitData(new SchemeData(C.UUID_NIL,
MimeTypes.VIDEO_WEBM, currentTrack.cryptoData.encryptionKey)); MimeTypes.VIDEO_WEBM, currentTrack.cryptoData.encryptionKey));
} }
break; break;

2
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
View File

@ -1275,7 +1275,7 @@ public final class FragmentedMp4Extractor implements Extractor {
if (uuid == null) { if (uuid == null) {
Log.w(TAG, "Skipped pssh atom (failed to extract uuid)"); Log.w(TAG, "Skipped pssh atom (failed to extract uuid)");
} else { } else {
schemeDatas.add(new SchemeData(uuid, null, MimeTypes.VIDEO_MP4, psshData)); schemeDatas.add(new SchemeData(uuid, MimeTypes.VIDEO_MP4, psshData));
} }
} }
} }

6
library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
View File

@ -60,11 +60,11 @@ public final class FormatTest {
@Test @Test
public void testParcelable() { public void testParcelable() {
DrmInitData.SchemeData DRM_DATA_1 = new DrmInitData.SchemeData(WIDEVINE_UUID, "cenc", VIDEO_MP4, DrmInitData.SchemeData drmData1 = new DrmInitData.SchemeData(WIDEVINE_UUID, VIDEO_MP4,
TestUtil.buildTestData(128, 1 /* data seed */)); TestUtil.buildTestData(128, 1 /* data seed */));
DrmInitData.SchemeData DRM_DATA_2 = new DrmInitData.SchemeData(C.UUID_NIL, null, VIDEO_WEBM, DrmInitData.SchemeData drmData2 = new DrmInitData.SchemeData(C.UUID_NIL, VIDEO_WEBM,
TestUtil.buildTestData(128, 1 /* data seed */)); TestUtil.buildTestData(128, 1 /* data seed */));
DrmInitData drmInitData = new DrmInitData(DRM_DATA_1, DRM_DATA_2); DrmInitData drmInitData = new DrmInitData(drmData1, drmData2);
byte[] projectionData = new byte[] {1, 2, 3}; byte[] projectionData = new byte[] {1, 2, 3};
Metadata metadata = new Metadata( Metadata metadata = new Metadata(
new TextInformationFrame("id1", "description1", "value1"), new TextInformationFrame("id1", "description1", "value1"),

2
library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
View File

@ -75,7 +75,7 @@ public final class DashUtilTest extends TestCase {
} }
private static DrmInitData newDrmInitData() { private static DrmInitData newDrmInitData() {
return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, null, "mimeType", return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "mimeType",
new byte[] {1, 4, 7, 0, 3, 6})); new byte[] {1, 4, 7, 0, 3, 6}));
} }

62
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View File

@ -238,6 +238,7 @@ public class DashManifestParser extends DefaultHandler
int audioChannels = Format.NO_VALUE; int audioChannels = Format.NO_VALUE;
int audioSamplingRate = parseInt(xpp, "audioSamplingRate", Format.NO_VALUE); int audioSamplingRate = parseInt(xpp, "audioSamplingRate", Format.NO_VALUE);
String language = xpp.getAttributeValue(null, "lang"); String language = xpp.getAttributeValue(null, "lang");
String drmSchemeType = null;
ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>(); ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
ArrayList<Descriptor> inbandEventStreams = new ArrayList<>(); ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
ArrayList<Descriptor> accessibilityDescriptors = new ArrayList<>(); ArrayList<Descriptor> accessibilityDescriptors = new ArrayList<>();
@ -254,9 +255,12 @@ public class DashManifestParser extends DefaultHandler
seenFirstBaseUrl = true; seenFirstBaseUrl = true;
} }
} else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) { } else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) {
SchemeData contentProtection = parseContentProtection(xpp); Pair<String, SchemeData> contentProtection = parseContentProtection(xpp);
if (contentProtection != null) { if (contentProtection.first != null) {
drmSchemeDatas.add(contentProtection); drmSchemeType = contentProtection.first;
}
if (contentProtection.second != null) {
drmSchemeDatas.add(contentProtection.second);
} }
} else if (XmlPullParserUtil.isStartTag(xpp, "ContentComponent")) { } else if (XmlPullParserUtil.isStartTag(xpp, "ContentComponent")) {
language = checkLanguageConsistency(language, xpp.getAttributeValue(null, "lang")); language = checkLanguageConsistency(language, xpp.getAttributeValue(null, "lang"));
@ -293,7 +297,7 @@ public class DashManifestParser extends DefaultHandler
List<Representation> representations = new ArrayList<>(representationInfos.size()); List<Representation> representations = new ArrayList<>(representationInfos.size());
for (int i = 0; i < representationInfos.size(); i++) { for (int i = 0; i < representationInfos.size(); i++) {
representations.add(buildRepresentation(representationInfos.get(i), contentId, representations.add(buildRepresentation(representationInfos.get(i), contentId,
drmSchemeDatas, inbandEventStreams)); drmSchemeType, drmSchemeDatas, inbandEventStreams));
} }
return buildAdaptationSet(id, contentType, representations, accessibilityDescriptors, return buildAdaptationSet(id, contentType, representations, accessibilityDescriptors,
@ -311,9 +315,9 @@ public class DashManifestParser extends DefaultHandler
String contentType = xpp.getAttributeValue(null, "contentType"); String contentType = xpp.getAttributeValue(null, "contentType");
return TextUtils.isEmpty(contentType) ? C.TRACK_TYPE_UNKNOWN return TextUtils.isEmpty(contentType) ? C.TRACK_TYPE_UNKNOWN
: MimeTypes.BASE_TYPE_AUDIO.equals(contentType) ? C.TRACK_TYPE_AUDIO : MimeTypes.BASE_TYPE_AUDIO.equals(contentType) ? C.TRACK_TYPE_AUDIO
: MimeTypes.BASE_TYPE_VIDEO.equals(contentType) ? C.TRACK_TYPE_VIDEO : MimeTypes.BASE_TYPE_VIDEO.equals(contentType) ? C.TRACK_TYPE_VIDEO
: MimeTypes.BASE_TYPE_TEXT.equals(contentType) ? C.TRACK_TYPE_TEXT : MimeTypes.BASE_TYPE_TEXT.equals(contentType) ? C.TRACK_TYPE_TEXT
: C.TRACK_TYPE_UNKNOWN; : C.TRACK_TYPE_UNKNOWN;
} }
protected int getContentType(Format format) { protected int getContentType(Format format) {
@ -336,19 +340,20 @@ public class DashManifestParser extends DefaultHandler
* @param xpp The parser from which to read. * @param xpp The parser from which to read.
* @throws XmlPullParserException If an error occurs parsing the element. * @throws XmlPullParserException If an error occurs parsing the element.
* @throws IOException If an error occurs reading the element. * @throws IOException If an error occurs reading the element.
* @return {@link SchemeData} parsed from the ContentProtection element, or null if the element is * @return The scheme type and/or {@link SchemeData} parsed from the ContentProtection element.
* unsupported. * Either or both may be null, depending on the ContentProtection element being parsed.
*/ */
protected SchemeData parseContentProtection(XmlPullParser xpp) throws XmlPullParserException, protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
IOException { throws XmlPullParserException, IOException {
String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri"); String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
boolean isPlayReady = "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95".equals(schemeIdUri); boolean isPlayReady = "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95".equals(schemeIdUri);
String schemeType = xpp.getAttributeValue(null, "value"); String schemeType = null;
byte[] data = null; byte[] data = null;
UUID uuid = null; UUID uuid = null;
boolean requiresSecureDecoder = false; boolean requiresSecureDecoder = false;
if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) { if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
schemeType = xpp.getAttributeValue(null, "value");
String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID"); String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
if (defaultKid != null) { if (defaultKid != null) {
UUID keyId = UUID.fromString(defaultKid); UUID keyId = UUID.fromString(defaultKid);
@ -379,8 +384,9 @@ public class DashManifestParser extends DefaultHandler
requiresSecureDecoder = robustnessLevel != null && robustnessLevel.startsWith("HW"); requiresSecureDecoder = robustnessLevel != null && robustnessLevel.startsWith("HW");
} }
} while (!XmlPullParserUtil.isEndTag(xpp, "ContentProtection")); } while (!XmlPullParserUtil.isEndTag(xpp, "ContentProtection"));
return data != null SchemeData schemeData = data != null
? new SchemeData(uuid, schemeType, MimeTypes.VIDEO_MP4, data, requiresSecureDecoder) : null; ? new SchemeData(uuid, MimeTypes.VIDEO_MP4, data, requiresSecureDecoder) : null;
return Pair.create(schemeType, schemeData);
} }
/** /**
@ -432,6 +438,7 @@ public class DashManifestParser extends DefaultHandler
float frameRate = parseFrameRate(xpp, adaptationSetFrameRate); float frameRate = parseFrameRate(xpp, adaptationSetFrameRate);
int audioChannels = adaptationSetAudioChannels; int audioChannels = adaptationSetAudioChannels;
int audioSamplingRate = parseInt(xpp, "audioSamplingRate", adaptationSetAudioSamplingRate); int audioSamplingRate = parseInt(xpp, "audioSamplingRate", adaptationSetAudioSamplingRate);
String drmSchemeType = null;
ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>(); ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
ArrayList<Descriptor> inbandEventStreams = new ArrayList<>(); ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
@ -452,9 +459,12 @@ public class DashManifestParser extends DefaultHandler
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) { } else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase); segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase);
} else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) { } else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) {
SchemeData contentProtection = parseContentProtection(xpp); Pair<String, SchemeData> contentProtection = parseContentProtection(xpp);
if (contentProtection != null) { if (contentProtection.first != null) {
drmSchemeDatas.add(contentProtection); drmSchemeType = contentProtection.first;
}
if (contentProtection.second != null) {
drmSchemeDatas.add(contentProtection.second);
} }
} else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) { } else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream")); inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
@ -466,7 +476,8 @@ public class DashManifestParser extends DefaultHandler
adaptationSetAccessibilityDescriptors, codecs); adaptationSetAccessibilityDescriptors, codecs);
segmentBase = segmentBase != null ? segmentBase : new SingleSegmentBase(); segmentBase = segmentBase != null ? segmentBase : new SingleSegmentBase();
return new RepresentationInfo(format, baseUrl, segmentBase, drmSchemeDatas, inbandEventStreams); return new RepresentationInfo(format, baseUrl, segmentBase, drmSchemeType, drmSchemeDatas,
inbandEventStreams);
} }
protected Format buildFormat(String id, String containerMimeType, int width, int height, protected Format buildFormat(String id, String containerMimeType, int width, int height,
@ -499,13 +510,19 @@ public class DashManifestParser extends DefaultHandler
} }
protected Representation buildRepresentation(RepresentationInfo representationInfo, protected Representation buildRepresentation(RepresentationInfo representationInfo,
String contentId, ArrayList<SchemeData> extraDrmSchemeDatas, String contentId, String extraDrmSchemeType, ArrayList<SchemeData> extraDrmSchemeDatas,
ArrayList<Descriptor> extraInbandEventStreams) { ArrayList<Descriptor> extraInbandEventStreams) {
Format format = representationInfo.format; Format format = representationInfo.format;
String drmSchemeType = representationInfo.drmSchemeType != null
? representationInfo.drmSchemeType : extraDrmSchemeType;
ArrayList<SchemeData> drmSchemeDatas = representationInfo.drmSchemeDatas; ArrayList<SchemeData> drmSchemeDatas = representationInfo.drmSchemeDatas;
drmSchemeDatas.addAll(extraDrmSchemeDatas); drmSchemeDatas.addAll(extraDrmSchemeDatas);
if (!drmSchemeDatas.isEmpty()) { if (!drmSchemeDatas.isEmpty()) {
format = format.copyWithDrmInitData(new DrmInitData(drmSchemeDatas)); DrmInitData drmInitData = new DrmInitData(drmSchemeDatas);
if (drmSchemeType != null) {
drmInitData = drmInitData.copyWithSchemeType(drmSchemeType);
}
format = format.copyWithDrmInitData(drmInitData);
} }
ArrayList<Descriptor> inbandEventStremas = representationInfo.inbandEventStreams; ArrayList<Descriptor> inbandEventStremas = representationInfo.inbandEventStreams;
inbandEventStremas.addAll(extraInbandEventStreams); inbandEventStremas.addAll(extraInbandEventStreams);
@ -946,14 +963,17 @@ public class DashManifestParser extends DefaultHandler
public final Format format; public final Format format;
public final String baseUrl; public final String baseUrl;
public final SegmentBase segmentBase; public final SegmentBase segmentBase;
public final String drmSchemeType;
public final ArrayList<SchemeData> drmSchemeDatas; public final ArrayList<SchemeData> drmSchemeDatas;
public final ArrayList<Descriptor> inbandEventStreams; public final ArrayList<Descriptor> inbandEventStreams;
public RepresentationInfo(Format format, String baseUrl, SegmentBase segmentBase, public RepresentationInfo(Format format, String baseUrl, SegmentBase segmentBase,
ArrayList<SchemeData> drmSchemeDatas, ArrayList<Descriptor> inbandEventStreams) { String drmSchemeType, ArrayList<SchemeData> drmSchemeDatas,
ArrayList<Descriptor> inbandEventStreams) {
this.format = format; this.format = format;
this.baseUrl = baseUrl; this.baseUrl = baseUrl;
this.segmentBase = segmentBase; this.segmentBase = segmentBase;
this.drmSchemeType = drmSchemeType;
this.drmSchemeDatas = drmSchemeDatas; this.drmSchemeDatas = drmSchemeDatas;
this.inbandEventStreams = inbandEventStreams; this.inbandEventStreams = inbandEventStreams;
} }

2
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
View File

@ -375,7 +375,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
StreamElement[] streamElementArray = new StreamElement[streamElements.size()]; StreamElement[] streamElementArray = new StreamElement[streamElements.size()];
streamElements.toArray(streamElementArray); streamElements.toArray(streamElementArray);
if (protectionElement != null) { if (protectionElement != null) {
DrmInitData drmInitData = new DrmInitData(new SchemeData(protectionElement.uuid, null, DrmInitData drmInitData = new DrmInitData(new SchemeData(protectionElement.uuid,
MimeTypes.VIDEO_MP4, protectionElement.data)); MimeTypes.VIDEO_MP4, protectionElement.data));
for (StreamElement streamElement : streamElementArray) { for (StreamElement streamElement : streamElementArray) {
for (int i = 0; i < streamElement.formats.length; i++) { for (int i = 0; i < streamElement.formats.length; i++) {