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

Merge "Deprecate MediaExtractor.setMediaCas"

Browse Source
This commit is contained in:
Santiago Seifert
2021-12-04 11:00:30 +00:00
committed by Android (Google) Code Review
parent d206f4b3a3 ebca37ec28
commit f223fd71a2
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -22769,7 +22769,7 @@ package android.media {
method public void setDataSource(@NonNull java.io.FileDescriptor) throws java.io.IOException;
method public void setDataSource(@NonNull java.io.FileDescriptor, long, long) throws java.io.IOException;
method public void setLogSessionId(@NonNull android.media.metrics.LogSessionId);
method public void setMediaCas(@NonNull android.media.MediaCas);
method @Deprecated public void setMediaCas(@NonNull android.media.MediaCas);
method public void unselectTrack(int);
field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2
field public static final int SAMPLE_FLAG_PARTIAL_FRAME = 4; // 0x4

11
media/java/android/media/MediaExtractor.java
View File

@@ -250,15 +250,10 @@ 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}.
*/
@Deprecated
public final void setMediaCas(@NonNull MediaCas mediaCas) {
mMediaCas = mediaCas;
nativeSetMediaCas(mediaCas.getBinder());