diff options
| author | Paul Zurcher <paul.zurcher@intel.com> | 2013-10-16 10:29:53 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:54 -0700 |
| commit | 7f8d444e96e8694d1ed3f18b1ff88cae7655da2d (patch) | |
| tree | e93b4d1f416dfaaf200eb3e8ef2f4bd24fe9b568 | |
| parent | d4ffa62a830805026da00079189d6120183b47e6 (diff) | |
| download | android_hardware_intel_common_omx-components-7f8d444e96e8694d1ed3f18b1ff88cae7655da2d.tar.gz android_hardware_intel_common_omx-components-7f8d444e96e8694d1ed3f18b1ff88cae7655da2d.tar.bz2 android_hardware_intel_common_omx-components-7f8d444e96e8694d1ed3f18b1ff88cae7655da2d.zip | |
[PORT FROM R42B-STABLE] BYT-DRM-WV: Removed locks from PAVP calls
BZ: 145681
Removed locks used to work around thread-safe issues in PAVP library.
Change-Id: If37a3202a360b0a3254de2a3403f888a5d6ecba1
Signed-off-by: Paul Zurcher <paul.zurcher@intel.com>
| -rw-r--r-- | videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp | 7 | ||||
| -rw-r--r-- | videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp index b6e8cd8..f1a5c86 100644 --- a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp +++ b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.cpp @@ -74,7 +74,6 @@ struct SECFrameBuffer { uint8_t num_entries; wv_packet_metadata packet_metadata[WV_MAX_PACKETS_IN_FRAME]; pavp_lib_session *pLibInstance; - android::Mutex* pWVPAVPLock; struct meimm MeiMm; uint32_t VADmaBase; }; @@ -217,7 +216,6 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE } else { LOGE("PAVP Heavy session created succesfully"); mpLibInstance = secBuffer->pLibInstance; - mLock = secBuffer->pWVPAVPLock; } if ( ret == OMX_ErrorNone) { pavp_lib_session::pavp_lib_code rc = pavp_lib_session::status_ok; @@ -246,9 +244,6 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE } } } - - if(secBuffer->pWVPAVPLock) - mLock = secBuffer->pWVPAVPLock; if(mpLibInstance) { bool balive = false; @@ -264,7 +259,6 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE ret = OMX_ErrorNotReady; //Destroy & re-create LOGI("Destroying the PAVP session..."); - android::Mutex::Autolock autoLock(*mLock); rc = mpLibInstance->pavp_destroy_session(); if (rc != pavp_lib_session::status_ok) LOGE("pavp_destroy_session failed with error 0x%x", rc); @@ -279,7 +273,6 @@ OMX_ERRORTYPE OMXVideoDecoderAVCSecure::PrepareDecodeBuffer(OMX_BUFFERHEADERTYPE } } if ( ret == OMX_ErrorNone) { - android::Mutex::Autolock autoLock(*mLock); wv_heci_process_video_frame_in input; wv_heci_process_video_frame_out output; sec_wv_packet_metadata metadata; diff --git a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h index 7f375d5..41331e7 100644 --- a/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h +++ b/videocodec/securevideo/baytrail/OMXVideoDecoderAVCSecure.h @@ -120,7 +120,6 @@ private: struct meimm mMeiMm; uint32_t mVADmaBase; pavp_lib_session *mpLibInstance; - android::Mutex *mLock; bool mDropUntilIDR; }; |