commit 355e8473df4a5b197f0cf136edfbede586416067
author Hassan Shojania <shojania@google.com> Fri May 12 10:33:16 2017 -0700
committer Hassan Shojania <shojania@google.com> Mon May 15 18:36:20 2017 -0700
tree f861410f2a1713975b0849d06f0036e0fdbdec29
parent d004c157bac96c4a180604bf304e0dbdb8bc11b5

Modular DRM for MediaPlayer/Race at stop/releaseDrm

Bug: 34559906
Bug: 37960096
Test: GTS LLAMA_H264_XX_V0_SYNC (1000 rounds)
Change-Id: I8576fb9dadf8922c2a54f2ea9e199d2e07c1820e

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0d4c730..6ded392 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -2787,6 +2787,11 @@
 
     status_t status;
     if (mCrypto != NULL) {
+        // notifying the source first before removing crypto from codec
+        if (mSource != NULL) {
+            mSource->releaseDrm();
+        }
+
         status=OK;
         // first making sure the codecs have released their crypto reference
         const sp<DecoderBase> &videoDecoder = getDecoder(false/*audio*/);