| commit | cdf0a102d94b00f85e3329c0d5257ac2e7939a1a | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Oct 19 21:55:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 21:55:25 2017 +0000 |
| tree | 04ac06c963e23011f56fe2b1134e86a265ca81fe | |
| parent | c4f7665a60d6c8f713c4e45e877057d5c571d0ed [diff] | |
| parent | 60719598d5d462574dbb8f7a99ad9faa9c2c50f4 [diff] |
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am: 60719598d5 Change-Id: Id2f4ed8f71a002794396dc11a77a0a42f55a44e6
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 1aae037..157758c 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -374,6 +374,8 @@ break; } + Mutex::Autolock _l(mLock); + ALOGV("[%x:%s] calling destroyComponentInstance", mNodeID, mName); OMX_ERRORTYPE err = master->destroyComponentInstance( static_cast<OMX_COMPONENTTYPE *>(mHandle));