summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-12-23 13:02:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-12-23 13:02:16 +0000
commit508fa90abe7c2b385c378894de757c9f04befcbd (patch)
tree46c804ca89f3c2b0bd1b6d0f60c9522dcfe707ae
parenta49a2db95ece73f62e6cca0706c01b5ab0c14da9 (diff)
parent347c70f6604d73a194398a20e055cd02fbc34bed (diff)
Merge "Re-add setMediaCas javadoc"
-rw-r--r--media/java/android/media/MediaExtractor.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index 7459e6339e57..dab188e40c1f 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -250,6 +250,13 @@ public final class MediaExtractor {
@NonNull FileDescriptor fd, long offset, long length) throws IOException;
/**
+ * Sets the MediaCas instance to use. This should be called after a successful setDataSource()
+ * if at least one track reports mime type of
+ * {@link android.media.MediaFormat#MIMETYPE_AUDIO_SCRAMBLED} or
+ * {@link android.media.MediaFormat#MIMETYPE_VIDEO_SCRAMBLED}. Stream parsing will not proceed
+ * until a valid MediaCas object is provided.
+ *
+ * @param mediaCas the MediaCas object to use.
* @deprecated Use the {@code Descrambler} system API instead, or DRM public APIs like
* {@link MediaDrm}.
*/