commit d07c92742fc5801cab8e99801f591365986acbe9
author Chong Zhang <chz@google.com> Tue Mar 28 11:02:06 2017 -0700
committer Chong Zhang <chz@google.com> Wed Mar 29 10:40:13 2017 -0700
tree f2bb6af46cd67d6d40098bfa86794097b43d41c6
parent 5f8beee0ea76ffe5cc40a517e8db43dbd64fbeff

Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE

This reverts commit de7268d8e20b883ec88a7ff19ad560a665373484.

Bug: 36479980
Bug: 36209723
Bug: 36660223

Change-Id: I8d83305a28dc35cee16f8f1068c90fdd0b9effff
(cherry picked from commit 6aa5c0662c86c7f7b2890577a207086eeecbd177)

media/libmedia/include/ICrypto.h

diff --git a/media/libmedia/include/ICrypto.h b/media/libmedia/include/ICrypto.h
index 8990f4b..f83c846 100644
--- a/media/libmedia/include/ICrypto.h
+++ b/media/libmedia/include/ICrypto.h
@@ -27,6 +27,7 @@
 
 struct AString;
 class IMemory;
+class IMemoryHeap;
 
 struct ICrypto : public IInterface {
     DECLARE_META_INTERFACE(Crypto);
@@ -64,6 +65,13 @@
             const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,
             const DestinationBuffer &destination, AString *errorDetailMsg) = 0;
 
+    /**
+     * Declare the heap that the shared memory source buffers passed
+     * to decrypt will be allocated from.
+     */
+    virtual void setHeap(const sp<IMemoryHeap>& heap) = 0;
+    virtual void unsetHeap(const sp<IMemoryHeap>& heap) = 0;
+
 private:
     DISALLOW_EVIL_CONSTRUCTORS(ICrypto);
 };