Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcc360b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Document that MediaExtractor only supports PSSH version 0" into main... 

Merge "Document that MediaExtractor only supports PSSH version 0" into main am: bf95f8e2 am: 9b185c50

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3492300



Change-Id: I989d85a87e82f237d4c940b35e9edd6d1f7e7de9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90fe8617 9b185c50

media/java/android/media/MediaExtractor.java

+7 −0
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ public final class MediaExtractor { 
    /**

     * Extract DRM initialization data if it exists

     *

     * <p>If the media contains a PSSH box, only PSSH version 0 is supported. The result for media

     * with other PSSH versions is undefined.

     *

     * @return DRM initialization data in the content, or {@code null}

     * if no recognizable DRM format is found;

     * @see DrmInitData
@@ -460,6 +463,10 @@ public final class MediaExtractor { 


    /**

     * Get the PSSH info if present.

     *

     * <p>This method only supports version 0 PSSH boxes. The result for other versions is

     * undefined.

     *

     * @return a map of uuid-to-bytes, with the uuid specifying

     * the crypto scheme, and the bytes being the data specific to that scheme.

     * This can be {@code null} if the source does not contain PSSH info.