diff options
| author | 2025-02-26 05:04:00 -0800 | |
|---|---|---|
| committer | 2025-02-26 05:04:00 -0800 | |
| commit | bf95f8e2c3a445465abefe5f1e6a6e228bdd7a25 (patch) | |
| tree | 7271252edb49043693a8983673c0860d6e900cbc | |
| parent | dfe71e56e52bedd9cc617bebce96825c85d54f78 (diff) | |
| parent | 629802fe916b93735cb560e1ddac8358fa7aed19 (diff) | |
Merge "Document that MediaExtractor only supports PSSH version 0" into main
| -rw-r--r-- | media/java/android/media/MediaExtractor.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index b11a81047bf8..4e1d472688ea 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -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. |