diff options
author | James Dong <jdong@google.com> | 2012-07-23 10:49:48 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-07-23 10:49:48 -0700 |
commit | 3499e2d178960ca3392855716c963eec7403a089 (patch) | |
tree | a29b0b4d569a9b51808e88062c6ac5b2b6153c20 | |
parent | f1b3ee26cafc80900bae681bddf47446a6a3733f (diff) | |
download | frameworks_av-3499e2d178960ca3392855716c963eec7403a089.zip frameworks_av-3499e2d178960ca3392855716c963eec7403a089.tar.gz frameworks_av-3499e2d178960ca3392855716c963eec7403a089.tar.bz2 |
Don't make the decrypted content available to Java applications via MediaExtractor.java API
Change-Id: I38df6a6be30a34ce3f2640f79784dc94c8ca1158
-rw-r--r-- | media/libstagefright/NuMediaExtractor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp index 29e1d21..64e5403 100644 --- a/media/libstagefright/NuMediaExtractor.cpp +++ b/media/libstagefright/NuMediaExtractor.cpp @@ -110,6 +110,12 @@ status_t NuMediaExtractor::setDataSource( // give us data in a call to MediaSource::read(), unlike its // default mode that we use from AwesomePlayer. static_cast<WVMExtractor *>(mImpl.get())->setCryptoPluginMode(true); + } else if (mImpl->getDrmFlag()) { + // For all other drm content, we don't want to expose decrypted + // content to Java application. + mImpl.clear(); + mImpl = NULL; + return ERROR_UNSUPPORTED; } mDataSource = dataSource; |