Merge "MediaExtractor: add getDrmInitData API" (153d7ada) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -20097,6 +20097,16 @@ package android.media {
		ctor public DeniedByServerException(java.lang.String);
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

		public static final class DrmInitData.SchemeInitData {
		field public final byte[] data;
		field public final java.lang.String mimeType;
		}

		public class ExifInterface {
		ctor public ExifInterface(java.lang.String) throws java.io.IOException;
		method public double getAltitude(double);
		@@ -20787,6 +20797,7 @@ package android.media {
		ctor public MediaExtractor();
		method public boolean advance();
		method public long getCachedDuration();
		method public android.media.DrmInitData getDrmInitData();
		method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
		method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
		method public int getSampleFlags();

api/system-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -21221,6 +21221,16 @@ package android.media {
		ctor public DeniedByServerException(java.lang.String);
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

		public static final class DrmInitData.SchemeInitData {
		field public final byte[] data;
		field public final java.lang.String mimeType;
		}

		public class ExifInterface {
		ctor public ExifInterface(java.lang.String) throws java.io.IOException;
		method public double getAltitude(double);
		@@ -21911,6 +21921,7 @@ package android.media {
		ctor public MediaExtractor();
		method public boolean advance();
		method public long getCachedDuration();
		method public android.media.DrmInitData getDrmInitData();
		method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
		method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
		method public int getSampleFlags();

api/test-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -20106,6 +20106,16 @@ package android.media {
		ctor public DeniedByServerException(java.lang.String);
		}

		public abstract class DrmInitData {
		ctor public DrmInitData();
		method public abstract android.media.DrmInitData.SchemeInitData get(java.util.UUID);
		}

		public static final class DrmInitData.SchemeInitData {
		field public final byte[] data;
		field public final java.lang.String mimeType;
		}

		public class ExifInterface {
		ctor public ExifInterface(java.lang.String) throws java.io.IOException;
		method public double getAltitude(double);
		@@ -20796,6 +20806,7 @@ package android.media {
		ctor public MediaExtractor();
		method public boolean advance();
		method public long getCachedDuration();
		method public android.media.DrmInitData getDrmInitData();
		method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
		method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
		method public int getSampleFlags();

media/java/android/media/DrmInitData.java

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.media;

		import android.media.MediaDrm;

		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.Map;
		import java.util.UUID;

		/**
		* Encapsulates initialization data required by a {@link MediaDrm} instance.
		*/
		public abstract class DrmInitData {

		/**
		* Retrieves initialization data for a given DRM scheme, specified by its UUID.
		*
		* @param schemeUuid The DRM scheme's UUID.
		* @return The initialization data for the scheme, or null if the scheme is not supported.
		*/
		public abstract SchemeInitData get(UUID schemeUuid);

		/**
		* Scheme initialization data.
		*/
		public static final class SchemeInitData {

		/**
		* The mimeType of {@link #data}.
		*/
		public final String mimeType;
		/**
		* The initialization data.
		*/
		public final byte[] data;

		/**
		* @param mimeType The mimeType of the initialization data.
		* @param data The initialization data.
		*
		* @hide
		*/
		public SchemeInitData(String mimeType, byte[] data) {
		this.mimeType = mimeType;
		this.data = data;
		}

		@Override
		public boolean equals(Object obj) {
		if (!(obj instanceof SchemeInitData)) {
		return false;
		}
		if (obj == this) {
		return true;
		}

		SchemeInitData other = (SchemeInitData) obj;
		return mimeType.equals(other.mimeType) && Arrays.equals(data, other.data);
		}

		@Override
		public int hashCode() {
		return mimeType.hashCode() + 31 * Arrays.hashCode(data);
		}

		}

		}

media/java/android/media/MediaExtractor.java

+42 −0

Original line number	Diff line number	Diff line
		@@ -34,7 +34,9 @@ import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.nio.ByteBuffer;
		import java.nio.ByteOrder;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		import java.util.UUID;

		@@ -225,6 +227,46 @@ final public class MediaExtractor {
		*/
		public native final int getTrackCount();

		/**
		* Extract DRM initialization data if it exists
		*
		* @return DRM initialization data in the content, or {@code null}
		* if no recognizable DRM format is found;
		* @see DrmInitData
		*/
		public DrmInitData getDrmInitData() {
		Map<String, Object> formatMap = getFileFormatNative();
		if (formatMap == null) {
		return null;
		}
		if (formatMap.containsKey("pssh")) {
		Map<UUID, byte[]> psshMap = getPsshInfo();
		final Map<UUID, DrmInitData.SchemeInitData> initDataMap =
		new HashMap<UUID, DrmInitData.SchemeInitData>();
		for (Map.Entry<UUID, byte[]> e: psshMap.entrySet()) {
		UUID uuid = e.getKey();
		byte[] data = e.getValue();
		initDataMap.put(uuid, new DrmInitData.SchemeInitData("cenc", data));
		}
		return new DrmInitData() {
		public SchemeInitData get(UUID schemeUuid) {
		return initDataMap.get(schemeUuid);
		}
		};
		} else if (formatMap.containsKey("crypto-key")) {
		ByteBuffer buf = (ByteBuffer) formatMap.get("crypto-key");
		buf.rewind();
		final byte[] data = new byte[buf.remaining()];
		buf.get(data);
		return new DrmInitData() {
		public SchemeInitData get(UUID schemeUuid) {
		return new DrmInitData.SchemeInitData("webm", data);
		}
		};
		}
		return null;
		}

		/**
		* Get the PSSH info if present.
		* @return a map of uuid-to-bytes, with the uuid specifying