Unhide MediaExtractor.getPsshInfo()

b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
This commit is contained in:
Marco Nelissen
2013-06-10 15:06:28 -07:00
parent ebb17713da
commit ecba2e4b95
2 changed files with 3 additions and 2 deletions

View File

@@ -11883,6 +11883,7 @@ package android.media {
ctor public MediaExtractor();
method public boolean advance();
method public long getCachedDuration();
method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();
method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);
method public int getSampleFlags();
method public long getSampleTime();

View File

@@ -199,9 +199,9 @@ final public class MediaExtractor {
public native final int getTrackCount();
/**
* Get the PSSH info if present. This returns a map of uuid-to-bytes, with the uuid specifying
* Get the PSSH info if present.
* @return a map of uuid-to-bytes, with the uuid specifying
* the crypto scheme, and the bytes being the data specific to that scheme.
* {@hide}
*/
public Map<UUID, byte[]> getPsshInfo() {
Map<UUID, byte[]> psshMap = null;