2 files changed, 16 insertions, 4 deletions
diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
index e271b20..cf477c4 100755
--- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.cpp
@@ -114,9 +114,17 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ProcessorDeinit(void) {
     // Session should be torn down in ProcessorStop, delayed to ProcessorDeinit
     // to allow remaining frames completely rendered.
     LOGI("Calling Drm_DestroySession.");
-    uint32_t sepres = drm_destroy_session(WV_SESSION_ID);
-    if (sepres != 0) {
-        LOGW("Drm_DestroySession returns %#x", sepres);
+    if (mDrmScheme == DRM_SCHEME_WV_CLASSIC) {
+        uint32_t sepres = drm_destroy_session(WV_SESSION_ID);
+        if (sepres != 0) {
+            LOGW("Drm_DestroySession returns %#x", sepres);
+        }
+    }
+    else if(mDrmScheme == DRM_SCHEME_WV_MODULAR) {
+        uint32_t ret = drm_wv_mod_stop_playback(WV_SESSION_ID);
+        if (ret != DRM_WV_MOD_SUCCESS) {
+            LOGW("Modular WV - drm_wv_mod_stop_playback returns %#x", ret);
+        }
     }
     return OMXVideoDecoderBase::ProcessorDeinit();
 }
@@ -332,14 +340,17 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE
 
         // OMX_BUFFERFLAG_CODECCONFIG is an optional flag
         // if flag is set, buffer will only contain codec data.
+        mDrmScheme = DRM_SCHEME_WV_CLASSIC;
         if (buffer->nFlags & OMX_BUFFERFLAG_CODECCONFIG) {
                LOGV("Received AVC codec data.");
                return ret;
         }
         return PrepareClassicWVDecodeBuffer(buffer, retain, p);
     }
-    else if(dataBuffer->drmScheme == DRM_SCHEME_WV_MODULAR)
+    else if(dataBuffer->drmScheme == DRM_SCHEME_WV_MODULAR) {
+        mDrmScheme = DRM_SCHEME_WV_MODULAR;
         return PrepareModularWVDecodeBuffer(buffer, retain, p);
+    }
     return ret;
 }
 
diff --git a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
index 497db0f..f9eaa8c 100755
--- a/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
+++ b/videocodec/securevideo/merrifield/OMXVideoDecoderAVCSecure.h
@@ -73,6 +73,7 @@ private:
     };
 
     OMX_VIDEO_PARAM_AVCTYPE mParamAvc;
+    uint32_t mDrmScheme;
 
     struct IMRSlot {
         uint32_t offset;