diff options
| author | Rajesh Poornachandran <rajesh.poornachandran@intel.com> | 2014-09-05 08:22:27 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-09-09 21:08:25 -0700 |
| commit | 31bbf36ad70e31a2e23d278583dcc4337dd22e49 (patch) | |
| tree | 7b26bed6aa768f782e413924865af47b92f339e0 | |
| parent | 94dfa71f4dcfb338d0c4d63d53c867acee23ba97 (diff) | |
| download | android_hardware_intel_common_omx-components-31bbf36ad70e31a2e23d278583dcc4337dd22e49.tar.gz android_hardware_intel_common_omx-components-31bbf36ad70e31a2e23d278583dcc4337dd22e49.tar.bz2 android_hardware_intel_common_omx-components-31bbf36ad70e31a2e23d278583dcc4337dd22e49.zip | |
Start and stop platform IED session.
Bug:17308418
BZ: 219166
Change-Id: If0a450071f1628d5db87217bdbaba7faf3143a4b
Signed-off-by: Rajesh Poornachandran <rajesh.poornachandran@intel.com>
| -rwxr-xr-x | videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp index a7db86f..bed475e 100755 --- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp @@ -120,17 +120,9 @@ 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."); - if (mDrmScheme == DRM_SCHEME_WVC) { - uint32_t sepres = drm_destroy_session(WV_SESSION_ID); - if (sepres != 0) { - LOGW("Drm_DestroySession returns %#x", sepres); - } - } - else if(mDrmScheme == DRM_SCHEME_CENC) { - 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); - } + uint32_t ret = drm_stop_playback(); + if (ret != DRM_WV_MOD_SUCCESS) { + ALOGE("drm_stop_playback failed: (0x%x)", ret); } return OMXVideoDecoderBase::ProcessorDeinit(); } @@ -139,6 +131,11 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::ProcessorStart(void) { uint32_t imrOffset = 0; uint32_t dataBufferSize = DATA_BUFFER_SIZE; + uint32_t ret = drm_start_playback(); + if (ret != DRM_WV_MOD_SUCCESS) { + ALOGE("drm_start_playback failed: (0x%x)", ret); + } + mSessionPaused = false; return OMXVideoDecoderBase::ProcessorStart(); } |