commit e6d7f46c566d16792068f25ef479e3fbae7365b8
author Jeff Tinker <jtinker@google.com> Fri Apr 27 08:26:51 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 27 08:26:51 2012 -0700
tree 18cb1f8303c03c3e0249610fe6c2f9d7aa96639e
parent 543f0fd46b2355c0ffc22445c8594f6dcde6a388
parent ed709d00ead015b8a0de50ebc410073f6a078fd5

Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-dev

media/libstagefright/WVMExtractor.cpp

diff --git a/media/libstagefright/WVMExtractor.cpp b/media/libstagefright/WVMExtractor.cpp
index effe336..08d2ae2 100644
--- a/media/libstagefright/WVMExtractor.cpp
+++ b/media/libstagefright/WVMExtractor.cpp
@@ -127,6 +127,12 @@
     }
 }
 
+void WVMExtractor::setCryptoPluginMode(bool cryptoPluginMode) {
+    if (mImpl != NULL) {
+        mImpl->setCryptoPluginMode(cryptoPluginMode);
+    }
+}
+
 void WVMExtractor::setUID(uid_t uid) {
     if (mImpl != NULL) {
         mImpl->setUID(uid);

media/libstagefright/include/WVMExtractor.h

diff --git a/media/libstagefright/include/WVMExtractor.h b/media/libstagefright/include/WVMExtractor.h
index 3c3ca89..2b952e2 100644
--- a/media/libstagefright/include/WVMExtractor.h
+++ b/media/libstagefright/include/WVMExtractor.h
@@ -34,6 +34,7 @@
 
     virtual int64_t getCachedDurationUs(status_t *finalStatus) = 0;
     virtual void setAdaptiveStreamingMode(bool adaptive) = 0;
+    virtual void setCryptoPluginMode(bool cryptoPluginMode) = 0;
     virtual void setUID(uid_t uid) = 0;
 };
 
@@ -61,6 +62,12 @@
     // is used.
     void setAdaptiveStreamingMode(bool adaptive);
 
+    // setCryptoPluginMode(true) to select crypto plugin mode.
+    // In this mode, the extractor returns encrypted data for use
+    // with the MediaCodec model, which handles the decryption in the
+    // codec.
+    void setCryptoPluginMode(bool cryptoPluginMode);
+
     void setUID(uid_t uid);
 
     static bool getVendorLibHandle();