commit 33327c7f0f04bcce3f8e8ee23953f87efc423037
author Jeff Tinker <jtinker@google.com> Wed Mar 15 23:41:23 2017 -0700
committer Jeff Tinker <jtinker@google.com> Fri Mar 17 11:33:24 2017 -0700
tree 2e3f8e0de5d2ad4a8d5e87c5ffa1d770e2041c49
parent d0cb831e7f14c43359aeb080d9564185d28c7a75

Fix decoder instantiation during playback

When a decoder is created while another decoder
is in use and the two decoders share a common
crypto instance, decryption results would become
indeterminate, which could cause the decoder to
hang. This change adds a notification to the
crypto instance so it can update state when its
ownership changes.

bug: 36209723

Test: playbacktests-debug-androidTest.apk as
described in the bug.

Change-Id: I453c260eace5543dd79a3569bf6a9592394c4113

drm/libmediadrm/CryptoHal.cpp

diff --git a/drm/libmediadrm/CryptoHal.cpp b/drm/libmediadrm/CryptoHal.cpp
index 1466222..9f41403 100644
--- a/drm/libmediadrm/CryptoHal.cpp
+++ b/drm/libmediadrm/CryptoHal.cpp
@@ -228,11 +228,11 @@
 void CryptoHal::setHeapBase(const sp<IMemoryHeap>& heap) {
     native_handle_t* nativeHandle = native_handle_create(1, 0);
     if (!nativeHandle) {
-        ALOGE("setSharedBufferBase(), failed to create native handle");
+        ALOGE("setHeapBase(), failed to create native handle");
         return;
     }
     if (heap == NULL) {
-        ALOGE("setSharedBufferBase(): heap is NULL");
+        ALOGE("setHeapBase(): heap is NULL");
         return;
     }
     int fd = heap->getHeapID();
@@ -244,6 +244,10 @@
     ALOGE_IF(!hResult.isOk(), "setSharedBufferBase(): remote call failed");
 }
 
+void CryptoHal::clearHeapBase(const sp<IMemoryHeap>& heap) {
+    mHeapBases.removeItem(heap->getBase());
+}
+
 status_t CryptoHal::toSharedBuffer(const sp<IMemory>& memory, ::SharedBuffer* buffer) {
     ssize_t offset;
     size_t size;
@@ -257,9 +261,8 @@
         return UNEXPECTED_NULL;
     }
 
-    if (mHeapBases.indexOfKey(heap->getBase()) < 0) {
-        setHeapBase(heap);
-    }
+    // memory must be in the declared heap
+    CHECK(mHeapBases.indexOfKey(heap->getBase()) >= 0);
 
     buffer->bufferId = mHeapBases.valueFor(heap->getBase());
     buffer->offset = offset >= 0 ? offset : 0;